90 lines
3.7 KiB
Text
90 lines
3.7 KiB
Text
$NetBSD: patch-ab,v 1.4 2011/06/10 09:43:41 tron Exp $
|
|
|
|
TeXinfo path fixes and the fix for CVE-2009-4029 taken from here:
|
|
|
|
http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0
|
|
|
|
--- Makefile.in.orig 2002-07-27 22:09:40.000000000 +0100
|
|
+++ Makefile.in 2011-06-10 10:37:07.000000000 +0100
|
|
@@ -137,11 +137,11 @@
|
|
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
|
if test -f $$p; then \
|
|
- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
|
|
- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
|
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`-$(APIVERSION)"; \
|
|
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`-$(APIVERSION); \
|
|
else if test -f $(srcdir)/$$p; then \
|
|
- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
|
|
- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
|
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`-$(APIVERSION)"; \
|
|
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`-$(APIVERSION); \
|
|
else :; fi; fi; \
|
|
done
|
|
|
|
@@ -183,7 +183,7 @@
|
|
.texi.info:
|
|
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
|
cd $(srcdir) \
|
|
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
|
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
|
|
|
.texi.dvi:
|
|
TEXINPUTS=.:$$TEXINPUTS \
|
|
@@ -227,23 +227,15 @@
|
|
install-info-am: $(INFO_DEPS)
|
|
@$(NORMAL_INSTALL)
|
|
$(mkinstalldirs) $(DESTDIR)$(infodir)
|
|
- @list='$(INFO_DEPS)'; \
|
|
- for file in $$list; do \
|
|
d=$(srcdir); \
|
|
- 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 $(DESTDIR)$(infodir)/$$ifile"; \
|
|
- $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
|
|
- else : ; fi; \
|
|
- done; \
|
|
- done
|
|
+ if test -f $$d/automake.info; then \
|
|
+ echo " $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info"; \
|
|
+ $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info; \
|
|
+ else : ; fi;
|
|
@$(POST_INSTALL)
|
|
- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
|
|
- list='$(INFO_DEPS)'; \
|
|
- for file in $$list; do \
|
|
- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
|
|
- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
|
|
- done; \
|
|
+ @if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
|
|
+ echo " $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info";\
|
|
+ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info || :;\
|
|
else : ; fi
|
|
|
|
uninstall-info:
|
|
@@ -456,7 +448,7 @@
|
|
distdir: $(DISTFILES)
|
|
-rm -rf $(distdir)
|
|
mkdir $(distdir)
|
|
- -chmod 777 $(distdir)
|
|
+ -chmod 755 $(distdir)
|
|
@for file in $(DISTFILES); do \
|
|
d=$(srcdir); \
|
|
if test -d $$d/$$file; then \
|
|
@@ -472,7 +464,7 @@
|
|
test -d $(distdir)/$$subdir \
|
|
|| mkdir $(distdir)/$$subdir \
|
|
|| exit 1; \
|
|
- chmod 777 $(distdir)/$$subdir; \
|
|
+ chmod 755 $(distdir)/$$subdir; \
|
|
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|
|
|| exit 1; \
|
|
fi; \
|
|
@@ -488,7 +480,6 @@
|
|
installcheck: installcheck-recursive
|
|
install-exec-am: install-binSCRIPTS
|
|
@$(NORMAL_INSTALL)
|
|
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
|
|
install-exec: install-exec-recursive
|
|
|
|
install-data-am: install-info-am install-pkgvdataDATA install-scriptDATA
|