diff options
Diffstat (limited to 'sysutils/cfengine2/patches/patch-aj')
| -rw-r--r-- | sysutils/cfengine2/patches/patch-aj | 90 |
1 files changed, 34 insertions, 56 deletions
diff --git a/sysutils/cfengine2/patches/patch-aj b/sysutils/cfengine2/patches/patch-aj index 11ffb950e94..1742802d0be 100644 --- a/sysutils/cfengine2/patches/patch-aj +++ b/sysutils/cfengine2/patches/patch-aj @@ -1,43 +1,33 @@ -$NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $ +$NetBSD: patch-aj,v 1.3 2004/08/10 14:18:44 ben Exp $ ---- contrib/Makefile.in.orig 2003-05-28 16:55:26.000000000 +0000 -+++ contrib/Makefile.in -@@ -145,9 +145,12 @@ target_vendor = @target_vendor@ - s1 = cfdoc - s2 = cfengine.el - --sbin_SCRIPTS = vicf $(s1) -+sbin_SCRIPTS = $(s1) - pkgdata_SCRIPTS = $(s2) - -+exampledir = $(prefix)/share/examples/cfengine -+example_SCRIPTS = vicf -+ - EXTRA_DIST = README README.vicf $(s1) $(s2) - - # -@@ -178,8 +181,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/src/conf.h - CONFIG_CLEAN_FILES = vicf +--- contrib/Makefile.in.orig 2004-08-09 13:27:41.000000000 -0400 ++++ contrib/Makefile.in 2004-08-09 20:44:12.000000000 -0400 +@@ -50,5 +50,7 @@ + pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT) + sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS) +SCRIPTS = $(example_SCRIPTS) $(pkgdata_SCRIPTS) $(sbin_SCRIPTS) - +depcomp = +am__depfiles_maybe = + SOURCES = DIST_SOURCES = - DIST_COMMON = README Makefile.am Makefile.in vicf.in - all: all-am -@@ -187,11 +192,31 @@ all: all-am - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +@@ -168,4 +170,6 @@ + sbin_SCRIPTS = vicf $(s1) + pkgdata_SCRIPTS = $(s2) ++exampledir = $(prefix)/share/examples/cfengine ++example_SCRIPTS = vicf + EXTRA_DIST = README README.vicf $(s1) $(s2) + +@@ -205,5 +209,5 @@ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu contrib/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps contrib/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - vicf: $(top_builddir)/config.status vicf.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + $(AUTOMAKE) --gnu contrib/Makefile +@@ -218,4 +222,26 @@ + esac; + +exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT) +install-exampleSCRIPTS: $(example_SCRIPTS) + @$(NORMAL_INSTALL) @@ -58,29 +48,18 @@ $NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $ + echo " rm -f $(DESTDIR)$(exampledir)/$$f"; \ + rm -f $(DESTDIR)$(exampledir)/$$f; \ + done - pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT) - install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) - @$(NORMAL_INSTALL) -@@ -276,7 +301,7 @@ check: check-am - all-am: Makefile $(SCRIPTS) - - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(exampledir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir) - - install: install-am - install-exec: install-exec-am -@@ -322,7 +347,7 @@ info: info-am - ++ ++ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +@@ -353,5 +379,5 @@ info-am: -install-data-am: install-pkgdataSCRIPTS +install-data-am: install-exampleSCRIPTS install-pkgdataSCRIPTS install-exec-am: install-sbinSCRIPTS - -@@ -348,17 +373,18 @@ ps: ps-am - +@@ -379,15 +405,16 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \ @@ -89,20 +68,19 @@ $NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $ + uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgdataSCRIPTS install-sbinSCRIPTS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ -+ install-am install-data install-data-am install-exampleSCRIPTS \ -+ install-exec install-exec-am install-info install-info-am \ -+ install-man install-pkgdataSCRIPTS install-sbinSCRIPTS \ ++ install install-am install-data install-data-am install-exampleSCRIPTS \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-pkgdataSCRIPTS install-sbinSCRIPTS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-exampleSCRIPTS uninstall-info-am \ uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS - # Tell versions [3.59,3.63) of GNU make to not export all variables. |