From: David MacKenzie <djm@djmnet.org>
Date: Thu, 24 Mar 1994 06:20:44 +0000 (+0000)
Subject: (acdatadir): New variable based on datadir, giving Autoconf lib files
X-Git-Tag: fsf-origin~761
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=078cb32b5c7164ed0caf5df3c23ea7be1f86bc1a;p=thirdparty%2Fautoconf.git

(acdatadir): New variable based on datadir, giving Autoconf lib files
their own subdirectory.  Use it instead of datadir.
---

diff --git a/Makefile.in b/Makefile.in
index 10b0b996f..987721c84 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ bindir = $(exec_prefix)/bin
 
 # Directory in which to install library files.
 datadir = $(prefix)/lib
+acdatadir = $(datadir)/autoconf
 
 # Directory in which to install documentation info files.
 infodir = $(prefix)/info
@@ -48,7 +49,7 @@ autoconf.texi autoconf.info standards.texi make-stds.texi standards.info \
 texinfo.tex acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
 configure configure.in autoheader.sh mkinstalldirs install.sh
 
-editsh = sed -e 's,@''datadir''@,$(datadir),g' -e 's,@''M4''@,$(M4),g'
+editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
 
 all: autoconf autoheader autoconf.info standards.info
 
@@ -79,16 +80,16 @@ standards.dvi: standards.texi make-stds.texi
 check:
 
 installdirs:
-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(datadir)
+	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
 
 # References to install-info have been removed until it's released.
 install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
 	$(INSTALL_PROGRAM) autoconf $(bindir)/autoconf
 	$(INSTALL_PROGRAM) autoheader $(bindir)/autoheader
-	$(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(datadir)/acgeneral.m4
-	$(INSTALL_DATA) $(srcdir)/acspecific.m4 $(datadir)/acspecific.m4
-	$(INSTALL_DATA) $(srcdir)/acconfig.h $(datadir)/acconfig.h
-	test ! -r $(srcdir)/aclocal.m4 || $(INSTALL_DATA) $(srcdir)/aclocal.m4 $(datadir)/aclocal.m4
+	$(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(acdatadir)/acgeneral.m4
+	$(INSTALL_DATA) $(srcdir)/acspecific.m4 $(acdatadir)/acspecific.m4
+	$(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
+	test ! -r $(srcdir)/aclocal.m4 || $(INSTALL_DATA) $(srcdir)/aclocal.m4 $(acdatadir)/aclocal.m4
 	-if test -f autoconf.info; then d=.; else d=$(srcdir); fi; \
 	$(INSTALL_DATA) $$d/autoconf.info $(infodir)/autoconf.info
 	-if test -f standards.info; then d=.; else d=$(srcdir); fi; \
@@ -96,8 +97,8 @@ install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
 
 uninstall:
 	rm -f $(bindir)/autoconf $(bindir)/autoheader
-	cd $(datadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
-	-rmdir $(datadir)
+	cd $(acdatadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
+	-rmdir $(acdatadir)
 	cd $(infodir); rm -f autoconf.info standards.info
 
 Makefile: Makefile.in
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 10b0b996f..987721c84 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,6 +35,7 @@ bindir = $(exec_prefix)/bin
 
 # Directory in which to install library files.
 datadir = $(prefix)/lib
+acdatadir = $(datadir)/autoconf
 
 # Directory in which to install documentation info files.
 infodir = $(prefix)/info
@@ -48,7 +49,7 @@ autoconf.texi autoconf.info standards.texi make-stds.texi standards.info \
 texinfo.tex acconfig.h autoconf.sh acgeneral.m4 acspecific.m4 \
 configure configure.in autoheader.sh mkinstalldirs install.sh
 
-editsh = sed -e 's,@''datadir''@,$(datadir),g' -e 's,@''M4''@,$(M4),g'
+editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
 
 all: autoconf autoheader autoconf.info standards.info
 
@@ -79,16 +80,16 @@ standards.dvi: standards.texi make-stds.texi
 check:
 
 installdirs:
-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(datadir)
+	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
 
 # References to install-info have been removed until it's released.
 install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
 	$(INSTALL_PROGRAM) autoconf $(bindir)/autoconf
 	$(INSTALL_PROGRAM) autoheader $(bindir)/autoheader
-	$(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(datadir)/acgeneral.m4
-	$(INSTALL_DATA) $(srcdir)/acspecific.m4 $(datadir)/acspecific.m4
-	$(INSTALL_DATA) $(srcdir)/acconfig.h $(datadir)/acconfig.h
-	test ! -r $(srcdir)/aclocal.m4 || $(INSTALL_DATA) $(srcdir)/aclocal.m4 $(datadir)/aclocal.m4
+	$(INSTALL_DATA) $(srcdir)/acgeneral.m4 $(acdatadir)/acgeneral.m4
+	$(INSTALL_DATA) $(srcdir)/acspecific.m4 $(acdatadir)/acspecific.m4
+	$(INSTALL_DATA) $(srcdir)/acconfig.h $(acdatadir)/acconfig.h
+	test ! -r $(srcdir)/aclocal.m4 || $(INSTALL_DATA) $(srcdir)/aclocal.m4 $(acdatadir)/aclocal.m4
 	-if test -f autoconf.info; then d=.; else d=$(srcdir); fi; \
 	$(INSTALL_DATA) $$d/autoconf.info $(infodir)/autoconf.info
 	-if test -f standards.info; then d=.; else d=$(srcdir); fi; \
@@ -96,8 +97,8 @@ install: all acgeneral.m4 acspecific.m4 acconfig.h installdirs
 
 uninstall:
 	rm -f $(bindir)/autoconf $(bindir)/autoheader
-	cd $(datadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
-	-rmdir $(datadir)
+	cd $(acdatadir); rm -f acgeneral.m4 acspecific.m4 aclocal.m4 acconfig.h
+	-rmdir $(acdatadir)
 	cd $(infodir); rm -f autoconf.info standards.info
 
 Makefile: Makefile.in