osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

autotools: refresh rpm-package target 

There's only so much we can/should do here, so dispense with the _topdir
test.

Change-Id: Ibf1170ea2cbb7c536df901db42d67da668fd64b2
Reviewed-on: https://code.wireshark.org/review/23912
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2017-10-14 14:54:10 +01:00 committed by João Valverde
parent cb89fdd1f6
commit 55e0503830
4 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -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) $@

17
configure.ac
View File

@ -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

2
packaging/Makefile.am
View File

@ -1,5 +1,5 @@
SUBDIRS = macosx rpm nsis wix
DIST_SUBDIRS = macosx rpm nsis wix
EXTRA_DIST = \
portableapps/appinfo.tmpl \

10
packaging/rpm/Makefile.am
View File

@ -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."