diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-20 01:06:29 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-20 01:06:29 +0000 |
| commit | adccfb88ae2ff05d5de34ebebe5ed1f195f22864 (patch) | |
| tree | 037650a932dccb53cbd0e86cc18e4afb557be1d0 | |
| parent | 15c6107d196baeb2ec9f4dea371b836306e09182 (diff) | |
Small cleanups to the rpm building process:
- Don't fail if the intermediate directories BUILD, SOURCE, SRPMS already
exist.
- Add these directories to .cvsignore.
svn path=/trunk/; revision=6029
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | packaging/rpm/.cvsignore | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 022d1d22fb..01ae2cc856 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.454 2002/08/19 21:33:29 jmayer Exp $ +# $Id: Makefile.am,v 1.455 2002/08/20 01:06:27 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -1076,7 +1076,7 @@ rpm_topdir=`cd $(top_srcdir) && pwd`/packaging/rpm rpm-package: dist if test x$(HAVE_RPM) = xyes ; then \ cd $(rpm_topdir) ; \ - mkdir BUILD RPMS SOURCES ; \ + mkdir -p BUILD RPMS SOURCES ; \ cd SOURCES ; \ ln -s ../../../$(distdir).tar.gz ; \ cd .. ; \ @@ -1088,7 +1088,7 @@ rpm-package: dist srpm-package: dist if test x$(HAVE_RPM) = xyes ; then \ cd $(rpm_topdir) ; \ - mkdir BUILD SRPMS SOURCES ; \ + mkdir -p BUILD SRPMS SOURCES ; \ cd SOURCES ; \ ln -s ../../../$(distdir).tar.gz ; \ cd .. ; \ diff --git a/packaging/rpm/.cvsignore b/packaging/rpm/.cvsignore index 3dda72986f..e9174aeeb4 100644 --- a/packaging/rpm/.cvsignore +++ b/packaging/rpm/.cvsignore @@ -1,2 +1,5 @@ +BUILD Makefile.in Makefile +SOURCES +SRPMS |