Changeset 528 for trunk

Timestamp:

Oct 29, 2017, 9:23:29 PM (7 years ago)

Author:

katerina

Message:

Fix for ticket #423 (make rpm failure).

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)

trunk/Makefile.in

@@ -923 +923 @@
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
-        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
         if ! test -d "$$RPMTOP"; then \
-          RPMTOP=`echo $$HOME/rpmbuild`; \
+          RPMTOP=/usr/src; \
         fi; \
         echo "Searching the RPM package below $$RPMTOP ..."; \
@@ -943 +943 @@
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
-        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
         if ! test -d "$$RPMTOP"; then \
-          RPMTOP=`echo $$HOME/rpmbuild`; \
+          RPMTOP=/usr/src; \
         fi; \
         echo "Searching the RPM package below $$RPMTOP ..."; \

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.2.2)
+AM_INIT_AUTOMAKE(samhain, 4.2.3)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+4.2.3:
+        * fix order of search directories for 'make rpm' (issue reported by
+        Z. Drableg)
+
 4.2.2:
         * fix bug with PortCheckSkip: for any given port, only first interface