diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | packaging/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/rpm/Makefile.am | 10 |
4 files changed, 12 insertions, 35 deletions
diff --git a/Makefile.am b/Makefile.am index c189e540cf..1cdd32ace9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -901,7 +901,6 @@ SUBDIRS = \ capchild \ caputils \ @plugins_dir@ \ - packaging \ help \ ui \ codecs \ @@ -1034,23 +1033,8 @@ update-databases-and-caches-install: update-databases-and-caches-common update-databases-and-caches-uninstall: update-databases-and-caches-common -rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm -if HAVE_RPM rpm-package: dist - @cd $(rpm_topdir) && \ - mkdir -p BUILD RPMS SOURCES SRPMS && \ - cd SOURCES && \ - ln -sf ../../../$(distdir).tar.xz && \ - cd .. && \ - $(RPMBUILD) --define "_topdir `cd . && pwd`" --define "_prefix $(prefix)" \ - @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec && \ - echo "Package successfully built in `pwd`/RPMS." ; \ - rm -f SOURCES/$(distdir).tar.xz ../../$(distdir).tar.xz -else -rpm-package: - @echo "'rpmbuild' executable not available." ; \ - false -endif + $(MAKE) -C packaging/rpm test-programs: cd epan && $(MAKE) $@ diff --git a/configure.ac b/configure.ac index 7346d73744..2d32b878d2 100644 --- a/configure.ac +++ b/configure.ac @@ -459,22 +459,7 @@ AS_IF([test $have_a2x_text = lynx], [A2X_LYNX="--lynx"]) AC_SUBST(A2X_LYNX) # RPM -# -# Looks for the rpmbuild program, and checks to see if we can redefine "_topdir". -# -AC_CHECK_PROGS(RPMBUILD, [rpmbuild], [false]) -if test "x$RPMBUILD" != "xfalse" ; then - AC_MSG_CHECKING([to see if we can redefine _topdir]) - rpm --define '_topdir /tmp' > /dev/null 2>&1 - if test $? -eq 0 ; then - AC_MSG_RESULT(yes) - have_rpm=yes - else - AC_MSG_RESULT([no, you'll have to build packages manually]) - have_rpm=no - fi -fi -AM_CONDITIONAL(HAVE_RPM, [test "x$have_rpm" = xyes]) +AC_CHECK_PROGS(RPMBUILD, [rpmbuild], [rpmbuild]) # # Use this as a proxy for "is this macOS" (just in case somebody actually diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 2342f81b8e..49a184a36a 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = macosx rpm nsis wix +DIST_SUBDIRS = macosx rpm nsis wix EXTRA_DIST = \ portableapps/appinfo.tmpl \ diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am index 5282dd2934..a8fcf76cca 100644 --- a/packaging/rpm/Makefile.am +++ b/packaging/rpm/Makefile.am @@ -1,4 +1,12 @@ -SUBDIRS = SPECS + +DIST_SUBDIRS = SPECS clean-local: rm -rf BUILD RPMS SOURCES SRPMS + +all-local: + $(MKDIR_P) BUILD RPMS SOURCES SRPMS + (cd SOURCES && $(LN_S) -f $(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.xz .) + $(RPMBUILD) --define "_topdir $(abs_builddir)" --define "_prefix $(prefix)" \ + @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec + @echo "Package successfully built in `pwd`/RPMS." |