diff options
| -rw-r--r-- | solaris/ChangeLog | 5 | ||||
| -rw-r--r-- | solaris/Makefile.am | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/solaris/ChangeLog b/solaris/ChangeLog index 72fb0f81..3dac1bc4 100644 --- a/solaris/ChangeLog +++ b/solaris/ChangeLog @@ -1,3 +1,8 @@ +2005-04-13 Paul Jakma <paul.jakma@sun.com> + + * Makefile.am: {i,r}.manifest are (or will be) system provided files + and not in CVS, hence dont depend on them or distribute them. + 2005-04-11 Paul Jakma <paul.jakma@sun.com> * (all) Initial check-in of files for building S10 packages diff --git a/solaris/Makefile.am b/solaris/Makefile.am index 0fb951ee..783d227b 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -1,5 +1,5 @@ # Solaris packages automake file -# $Id: Makefile.am,v 1.2 2005/04/11 07:58:35 paul Exp $ +# $Id: Makefile.am,v 1.3 2005/04/13 03:37:23 paul Exp $ .PHONY: packages @@ -91,11 +91,10 @@ quagga.init: $(srcdir)/quagga.init.in Makefile # construct the pkg @PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg: prototype.% \ - quagga.init pkginfo.%.full i.manifest r.manifest + quagga.init pkginfo.%.full ($(pkg_make) && \ $(pkg_trans) "QUAGGA$*") - %.pkg.gz : %.pkg (gzip -c $< > $@) @@ -109,7 +108,7 @@ CLEANFILES := $(BUILT_SOURCES) $(pkg_packages) EXTRA_DIST := $(pkg_depends) $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \ $(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \ - quagga.init.in options.xml r.manifest i.manifest README.txt + quagga.init.in README.txt pkg-root-install: (cd $(top_builddir) && \ |