71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
|
--- src/autoconf-2.13/Makefile.in
|
||
|
|
+++ Makefile.in
|
||
|
|
@@ -33,8 +33,8 @@
|
||
|
|
# Programs that are ALWAYS installed (and are created in the build dir).
|
||
|
|
ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames
|
||
|
|
|
||
|
|
-# M4 input that is frozen.
|
||
|
|
-M4FROZEN = autoconf.m4f autoheader.m4f
|
||
|
|
+# Don't freeze anything with OpenBSD m4
|
||
|
|
+M4FROZEN =
|
||
|
|
|
||
|
|
# All programs, including those only installed if you have perl.
|
||
|
|
SCRIPTS = $(ASCRIPTS) @SCRIPTS@
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -137,23 +137,23 @@
|
||
|
|
cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
|
||
|
|
|
||
|
|
installdirs:
|
||
|
|
- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
|
||
|
|
+ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(acdatadir)
|
||
|
|
|
||
|
|
install: all $(M4FILES) acconfig.h installdirs install-info
|
||
|
|
for p in $(ASCRIPTS); do \
|
||
|
|
- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
|
||
|
|
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||
|
|
done
|
||
|
|
for i in $(M4FROZEN); do \
|
||
|
|
- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
|
||
|
|
+ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \
|
||
|
|
done
|
||
|
|
for i in $(M4FILES) acconfig.h; do \
|
||
|
|
- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
|
||
|
|
+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
|
||
|
|
done
|
||
|
|
-if test -f autoscan; then \
|
||
|
|
- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
|
||
|
|
+ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \
|
||
|
|
for i in acfunctions acheaders acidentifiers acprograms \
|
||
|
|
acmakevars; do \
|
||
|
|
- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
|
||
|
|
+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \
|
||
|
|
done; \
|
||
|
|
else :; fi
|
||
|
|
|
||
|
|
@@ -161,11 +161,11 @@
|
||
|
|
install-info: info installdirs
|
||
|
|
if test -f autoconf.info; then \
|
||
|
|
for i in *.info*; do \
|
||
|
|
- $(INSTALL_DATA) $$i $(infodir)/$$i; \
|
||
|
|
+ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \
|
||
|
|
done; \
|
||
|
|
else \
|
||
|
|
for i in $(srcdir)/*.info*; do \
|
||
|
|
- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
|
||
|
|
+ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
|
||
|
|
done; \
|
||
|
|
fi
|
||
|
|
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -139,7 +139,7 @@
|
||
|
|
installdirs:
|
||
|
|
$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir)
|
||
|
|
|
||
|
|
-install: all $(M4FILES) acconfig.h installdirs install-info
|
||
|
|
+install: all $(M4FILES) acconfig.h installdirs
|
||
|
|
for p in $(ASCRIPTS); do \
|
||
|
|
$(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||
|
|
done
|