Improve Makefile configuration and support DESTDIRHEADoriginmaster

1 files changed, 35 insertions, 24 deletions

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b23619d..7d68813 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,18 +17,20 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 # Version number of this release.
-version = .6g
+version = @PACKAGE_VERSION@
+
+DESTDIR =
 
 # Installation prefixes.  Since GNU programs and the TeX system may be
 # installed in different places, we have different prefixes.
-prefix = /usr/local
-exec_prefix = $(prefix)
-texmf_prefix = /usr/local
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+texmf_prefix = $(prefix)
 
 # Installation directories.
-bindir = $(exec_prefix)/bin
-infodir = $(prefix)/info
-datadir = $(prefix)/lib
+bindir = @bindir@
+infodir = @infodir@
+datadir = @datadir@
 fu_datadir = $(datadir)/fontutil
 emacs_datadir = $(datadir)/emacs
 # Emacs 18 and Emacs 19 both have different directories for this.
@@ -57,7 +59,7 @@ default_tfm_path = .:$(texdatadir)/fonts//
 default_pk_path = $(default_tfm_path)
 default_gf_path = $(default_tfm_path)
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -72,13 +74,13 @@ xincludedir = -I $(xincdir)
 xlibdir = -L $(xlibdirp)
 
 CC = @CC@
-CFLAGS = -g
+CFLAGS = @CFLAGS@
 
 # Need DEFS to get -DHAVE_CONFIG_H.  It's included in CPPFLAGS via
 # data/defs.make.
 DEFS = @DEFS@
 
-LDFLAGS = $(xlibdir) $(CFLAGS) $(XLDFLAGS)
+LDFLAGS = @LDFLAGS@ $(xlibdir) $(CFLAGS) $(XLDFLAGS)
 LIBS = @LIBS@ -lm $(extralibs)
 wlibs = @wlibs@
 
@@ -112,9 +114,9 @@ default: all
 ifeq "$(xincdir)" ""
 	ifeq "$(xlibdirp)" ""
 		makeargs = $(MFLAGS) \
-  		  SHELL="$(SHELL)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-  		  LIBS="$(LIBS)" RANLIB="$(RANLIB)" srcdir=$(srcdir) \
-  		  wlibs="$(wlibs)" widgets="$(widgets)" 
+		  SHELL="$(SHELL)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		  LIBS="$(LIBS)" RANLIB="$(RANLIB)" srcdir=$(srcdir) \
+		  wlibs="$(wlibs)" widgets="$(widgets)" 
 	endif
 else
 makeargs = $(MFLAGS) \
@@ -147,25 +149,34 @@ include/paths.h: include/paths.h.in GNUmakefile GNUmakefile.in
           $< >> $@
 
 
-installargs = bindir=$(bindir) \
-  fu_datadir=$(fu_datadir) \
-  emacslispdir=$(emacslispdir) \
-  mfinputdir=$(mfinputdir) \
-  texinputdir=$(texinputdir) \
-  app_defaults=$(app_defaults) \
+installargs = bindir=$(DESTDIR)$(bindir) \
+  fu_datadir=$(DESTDIR)$(fu_datadir) \
+  emacslispdir=$(DESTDIR)$(emacslispdir) \
+  mfinputdir=$(DESTDIR)$(mfinputdir) \
+  texinputdir=$(DESTDIR)$(texinputdir) \
+  app_defaults=$(DESTDIR)$(app_defaults) \
+  kpathsea_parent=/usr/include/kpathsea \
+  kpathsea=/usr/lib/libkpathsea.a \
+  CFLAGS="$(CFLAGS)" \
   INSTALL="$(INSTALL)" \
   INSTALL_DATA="$(INSTALL_DATA)" \
   INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
 
-install:
-	PATH=.:$PATH mkdirchain $(bindir) $(infodir) \
-	  $(fu_datadir) $(emacslispdir) $(app_defaults)
+installdirs:
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(infodir) 
+	mkdir -p $(DESTDIR)$(fu_datadir) 
+	mkdir -p $(DESTDIR)$(emacslispdir) 
+	mkdir -p $(DESTDIR)$(app_defaults)
+	mkdir -p $(DESTDIR)$(texdatadir)
+	mkdir -p $(DESTDIR)$(texinputdir)
+
+install: installdirs
 	for dir in $(programs) doc; do					\
           (cd $${dir}; $(MAKE) $(installargs) install);			\
         done
 	cd data; for f in *.enc *.map common.cmi; do 			\
-	  $(INSTALL_DATA) $$f $(fu_datadir); done
-
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(fu_datadir); done
 
 configure: configure.in
 	cd $(srcdir); autoconf