summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2017-06-28 22:42:28 -0400
committerAlexei Podtelezhnikov <apodtele@gmail.com>2017-06-28 22:42:28 -0400
commit5dc559238629c9476e9a70543f598b8854a81d1a (patch)
tree185a5843034415c41b368ff2df2eb5c1cfd97ae7
parent3e4acb6856a5957ca98700bc66b97d64f54b0503 (diff)
Respect DESTDIR and CFLAGS.
-rw-r--r--Makefile.in6
-rwxr-xr-xconfigure2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 6854866..432f6d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ HOST= @HOST@
DARWIN_CORE = $(if $(findstring apple-darwin,$(HOST)),/System/Library/Frameworks/CoreServices.framework/CoreServices,)
WFLAGS = -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses -pedantic
-CFLAGS = -g $(WFLAGS)
+CFLAGS = ${WFLAGS} @CFLAGS@
FONDUOBJS = fondu.o readnfnt.o fondups.o
UFONDOBJS = ufond.o ufondbdf.o ufondpfb.o ufondttf.o crctab.o
DFONT2RESOBJS = dfont2res.o crctab.o
@@ -57,8 +57,8 @@ distclean: clean
-rm Makefile
install: all
- mkdir -p $(DESTDIR)$(bindir)
- cp fondu ufond showfond dfont2res tobin frombin lumper setfondname $(DESTDIR)$(bindir)
+ install -m 755 -d $(DESTDIR)$(bindir)
+ install -m 755 fondu ufond showfond dfont2res tobin frombin lumper setfondname $(DESTDIR)$(bindir)
VERSION:=$(shell date +"%y%d%m")
diff --git a/configure b/configure
index 1bdfe38..890a77b 100755
--- a/configure
+++ b/configure
@@ -251,7 +251,7 @@ exec 6>&1
#
# Initializations.
#
-ac_default_prefix=/usr/local
+ac_default_prefix=$(DESTDIR)
ac_config_libobj_dir=.
cross_compiling=no
subdirs=