From: Tom Tromey Date: Fri, 20 Mar 1998 20:09:08 +0000 (+0000) Subject: added DESTDIR support X-Git-Tag: Release-1-2h~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=660081d8f479b989d62bb256c09cb2c786d0fb1e;p=thirdparty%2Fautomake.git added DESTDIR support --- diff --git a/ChangeLog b/ChangeLog index c2d327a8d..051cbc9ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ Fri Mar 20 00:26:10 1998 Tom Tromey + * texinfos.am: Include $(DESTDIR). + * lisp.am: Include $(DESTDIR). + * java.am: Include $(DESTDIR). + * mans.am (install-man@SECTION@): Include $(DESTDIR). + * automake.in (handle_man_pages): Include $(DESTDIR) in + installdirs variable. + (handle_texinfo): Likewise. + (am_install_var): Likewise. + * header-vars.am (DISTDIR): Define. + * data.am, header.am, libs.am, ltlib.am, progs.am, scripts.am: + Support $(DESTDIR) at install time. From Assar Westerlund. + * automake.in (handle_java): Put Java sources in distribution. Thu Mar 19 01:33:35 1998 Tom Tromey diff --git a/automake.in b/automake.in index 9c1b76310..7071538a3 100755 --- a/automake.in +++ b/automake.in @@ -2156,7 +2156,7 @@ sub handle_texinfo if (! defined $options{'no-installinfo'}) { push (@uninstall, 'uninstall-info'); - push (@installdirs, '$(infodir)'); + push (@installdirs, '$(DESTDIR)$(infodir)'); unshift (@install_data, 'install-info-am'); # Make sure documentation is made and installed first. Use @@ -2223,7 +2223,7 @@ sub handle_man_pages foreach $sect (sort keys %sections) { &define_variable ('man' . $sect . 'dir', '$(mandir)/man' . $sect); - push (@installdirs, '$(mandir)/man' . $sect) + push (@installdirs, '$(DESTDIR)$(mandir)/man' . $sect) unless defined $options{'no-installman'}; $output_rules .= &file_contents_with_transform ('s/\@SECTION\@/' . $sect . '/g;', @@ -5951,7 +5951,7 @@ sub am_install_var push (@uninstall, 'uninstall-' . $X . $primary); push (@phony, 'uninstall-' . $X . $primary); - push (@installdirs, '$(' . $X . 'dir)'); + push (@installdirs, '$(DATADIR)$(' . $X . 'dir)'); if (defined $exec_dir_p{$X} ? $exec_dir_p{$X} : ($X =~ /exec/)) { push (@install_exec, 'install-' . $X . $primary); diff --git a/data.am b/data.am index 6a88c846a..82883d6e1 100644 --- a/data.am +++ b/data.am @@ -17,21 +17,21 @@ ## 02111-1307, USA. install-@DIR@DATA: $(@DIR@_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_DATA)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ fi; fi; \ done uninstall-@DIR@DATA: @$(NORMAL_UNINSTALL) list='$(@DIR@_DATA)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/header-vars.am b/header-vars.am index 6298dfe9c..a47dd32e9 100644 --- a/header-vars.am +++ b/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -36,6 +36,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + ## Some derived variables that have been found to be useful. pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ diff --git a/header.am b/header.am index 80a50f0ca..b65a27072 100644 --- a/header.am +++ b/header.am @@ -17,16 +17,16 @@ ## 02111-1307, USA. install-@DIR@HEADERS: $(@DIR@_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_HEADERS)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ done uninstall-@DIR@HEADERS: @$(NORMAL_UNINSTALL) list='$(@DIR@_HEADERS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/java.am b/java.am index 801107224..b72cdc278 100644 --- a/java.am +++ b/java.am @@ -17,17 +17,17 @@ ## 02111-1307, USA. install-@DIR@JAVA: class@DIR@.stamp @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## A single .java file can be compiled into multiple .class files. So ## we just install all the .class files that got built into this ## directory. This is not optimal, but will have to do for now. for p in *.class; do \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ done uninstall-@DIR@JAVA: @$(NORMAL_UNINSTALL) for p in *.class; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/data.am b/lib/am/data.am index 6a88c846a..82883d6e1 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -17,21 +17,21 @@ ## 02111-1307, USA. install-@DIR@DATA: $(@DIR@_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_DATA)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ fi; fi; \ done uninstall-@DIR@DATA: @$(NORMAL_UNINSTALL) list='$(@DIR@_DATA)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 6298dfe9c..a47dd32e9 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -36,6 +36,8 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + ## Some derived variables that have been found to be useful. pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ diff --git a/lib/am/header.am b/lib/am/header.am index 80a50f0ca..b65a27072 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -17,16 +17,16 @@ ## 02111-1307, USA. install-@DIR@HEADERS: $(@DIR@_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_HEADERS)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ done uninstall-@DIR@HEADERS: @$(NORMAL_UNINSTALL) list='$(@DIR@_HEADERS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/java.am b/lib/am/java.am index 801107224..b72cdc278 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -17,17 +17,17 @@ ## 02111-1307, USA. install-@DIR@JAVA: class@DIR@.stamp @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## A single .java file can be compiled into multiple .class files. So ## we just install all the .class files that got built into this ## directory. This is not optimal, but will have to do for now. for p in *.class; do \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ done uninstall-@DIR@JAVA: @$(NORMAL_UNINSTALL) for p in *.class; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/libs.am b/lib/am/libs.am index cfb8e5533..706ac6dd6 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -17,13 +17,13 @@ ## 02111-1307, USA. install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done ## We do two loops here so that $(POST_INSTALL) can be empty. If we @@ -35,13 +35,13 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. - echo " $(RANLIB) $(@DIR@dir)/$$p"; \ - $(RANLIB) $(@DIR@dir)/$$p; \ + echo " $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done uninstall-@DIR@LIBRARIES: @$(NORMAL_UNINSTALL) list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 44e0b8543..ab3feb751 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -17,21 +17,21 @@ ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LISP)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \ - $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ else : ; fi; \ done uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) list='$(@DIR@_LISP)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p $(@DIR@dir)/$${p}c; \ + rm -f $(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ done diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index 23ae30e4e..ff5bbe65e 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -17,20 +17,20 @@ ## 02111-1307, USA. install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. - echo "@LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - @LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo "@LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + @LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done uninstall-@DIR@LTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ - @LIBTOOL --mode=uninstall@ rm -f $(@DIR@dir)/$$p; \ + @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/mans.am b/lib/am/mans.am index 091888f8b..6c2401b03 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-man@SECTION@: - $(mkinstalldirs) $(man@SECTION@dir) + $(mkinstalldirs) $(DESTDIR)$(man@SECTION@dir) @list='$(man@SECTION@_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. @@ -35,8 +35,8 @@ install-man@SECTION@: ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(man@SECTION@dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(man@SECTION@dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst; \ done ## This is just completely gross. @@ -56,6 +56,6 @@ uninstall-man@SECTION@: ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(man@SECTION@dir)/$$inst"; \ - rm -f $(man@SECTION@dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ + rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \ done diff --git a/lib/am/progs.am b/lib/am/progs.am index 418cee5f2..741902a79 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -17,7 +17,7 @@ ## 02111-1307, USA. install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ @@ -25,13 +25,13 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-@DIR@PROGRAMS: @$(NORMAL_UNINSTALL) list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done diff --git a/lib/am/scripts.am b/lib/am/scripts.am index dc41c3ba1..420abb4b2 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -17,23 +17,23 @@ ## 02111-1307, USA. install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done uninstall-@DIR@SCRIPTS: @$(NORMAL_UNINSTALL) list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done ## Uncomment line in handle_scripts when this is uncommented. diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 8979d9a15..c697e981f 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -139,7 +139,7 @@ DVIPS = dvips ## `install-info' for the user. install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(infodir) + $(mkinstalldirs) $(DESTDIR)$(infodir) @for file in $(INFO_DEPS); do \ CYGNUS if test -f $$file; then d=.; else d=$(srcdir); fi; \ NOTCYGNUS d=$(srcdir); \ @@ -147,8 +147,8 @@ NOTCYGNUS d=$(srcdir); \ ## be relative, for the install. for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ + echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ else : ; fi; \ done; \ done @@ -163,10 +163,10 @@ NOTCYGNUS d=$(srcdir); \ ## instance if you don't have a dir file, install-info will fail. I ## think instead it should create a new dir file for you. This bug ## causes the `make distcheck' target to fail reliably. - echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ ## Use `|| :' here because Sun make passes -e to sh; if install-info ## fails then we'd fail if we used `;'. - install-info --info-dir=$(infodir) $(infodir)/$$file || :;\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ done; \ else : ; fi @@ -179,11 +179,11 @@ uninstall-info: else ii=; fi; \ for file in $(INFO_DEPS); do \ test -z "$ii" \ - || install-info --info-dir=$(infodir) --remove $$file; \ + || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) for file in $(INFO_DEPS); do \ - (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done dist-info: $(INFO_DEPS) diff --git a/libs.am b/libs.am index cfb8e5533..706ac6dd6 100644 --- a/libs.am +++ b/libs.am @@ -17,13 +17,13 @@ ## 02111-1307, USA. install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done ## We do two loops here so that $(POST_INSTALL) can be empty. If we @@ -35,13 +35,13 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. - echo " $(RANLIB) $(@DIR@dir)/$$p"; \ - $(RANLIB) $(@DIR@dir)/$$p; \ + echo " $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done uninstall-@DIR@LIBRARIES: @$(NORMAL_UNINSTALL) list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lisp.am b/lisp.am index 44e0b8543..ab3feb751 100644 --- a/lisp.am +++ b/lisp.am @@ -17,21 +17,21 @@ ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LISP)'; for p in $$list; do \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \ - $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ else : ; fi; \ done uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) list='$(@DIR@_LISP)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p $(@DIR@dir)/$${p}c; \ + rm -f $(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ done diff --git a/ltlib.am b/ltlib.am index 23ae30e4e..ff5bbe65e 100644 --- a/ltlib.am +++ b/ltlib.am @@ -17,20 +17,20 @@ ## 02111-1307, USA. install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any lossage ## if the program doesn't have a name that libtool expects. - echo "@LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \ - @LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + echo "@LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ + @LIBTOOL --mode=install@ $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ else :; fi; \ done uninstall-@DIR@LTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ - @LIBTOOL --mode=uninstall@ rm -f $(@DIR@dir)/$$p; \ + @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/mans.am b/mans.am index 091888f8b..6c2401b03 100644 --- a/mans.am +++ b/mans.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-man@SECTION@: - $(mkinstalldirs) $(man@SECTION@dir) + $(mkinstalldirs) $(DESTDIR)$(man@SECTION@dir) @list='$(man@SECTION@_MANS)'; \ ## Extract all items from man_MANS that should go in this section. ## This must be done dynamically to support conditionals. @@ -35,8 +35,8 @@ install-man@SECTION@: ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(man@SECTION@dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(man@SECTION@dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man@SECTION@dir)/$$inst; \ done ## This is just completely gross. @@ -56,6 +56,6 @@ uninstall-man@SECTION@: ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(man@SECTION@dir)/$$inst"; \ - rm -f $(man@SECTION@dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst"; \ + rm -f $(DESTDIR)$(man@SECTION@dir)/$$inst; \ done diff --git a/progs.am b/progs.am index 418cee5f2..741902a79 100644 --- a/progs.am +++ b/progs.am @@ -17,7 +17,7 @@ ## 02111-1307, USA. install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ @@ -25,13 +25,13 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-@DIR@PROGRAMS: @$(NORMAL_UNINSTALL) list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done diff --git a/scripts.am b/scripts.am index dc41c3ba1..420abb4b2 100644 --- a/scripts.am +++ b/scripts.am @@ -17,23 +17,23 @@ ## 02111-1307, USA. install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(@DIR@dir) + $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; fi; \ done uninstall-@DIR@SCRIPTS: @$(NORMAL_UNINSTALL) list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done ## Uncomment line in handle_scripts when this is uncommented. diff --git a/texinfos.am b/texinfos.am index 8979d9a15..c697e981f 100644 --- a/texinfos.am +++ b/texinfos.am @@ -139,7 +139,7 @@ DVIPS = dvips ## `install-info' for the user. install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(infodir) + $(mkinstalldirs) $(DESTDIR)$(infodir) @for file in $(INFO_DEPS); do \ CYGNUS if test -f $$file; then d=.; else d=$(srcdir); fi; \ NOTCYGNUS d=$(srcdir); \ @@ -147,8 +147,8 @@ NOTCYGNUS d=$(srcdir); \ ## be relative, for the install. for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ + echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ else : ; fi; \ done; \ done @@ -163,10 +163,10 @@ NOTCYGNUS d=$(srcdir); \ ## instance if you don't have a dir file, install-info will fail. I ## think instead it should create a new dir file for you. This bug ## causes the `make distcheck' target to fail reliably. - echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ ## Use `|| :' here because Sun make passes -e to sh; if install-info ## fails then we'd fail if we used `;'. - install-info --info-dir=$(infodir) $(infodir)/$$file || :;\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ done; \ else : ; fi @@ -179,11 +179,11 @@ uninstall-info: else ii=; fi; \ for file in $(INFO_DEPS); do \ test -z "$ii" \ - || install-info --info-dir=$(infodir) --remove $$file; \ + || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) for file in $(INFO_DEPS); do \ - (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done dist-info: $(INFO_DEPS)