Changeset 528


Ignore:
Timestamp:
Oct 29, 2017, 9:23:29 PM (7 years ago)
Author:
katerina
Message:

Fix for ticket #423 (make rpm failure).

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r518 r528  
    923923        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    924924        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
    925         if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
     925        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
    926926        if ! test -d "$$RPMTOP"; then \
    927           RPMTOP=`echo $$HOME/rpmbuild`; \
     927          RPMTOP=/usr/src; \
    928928        fi; \
    929929        echo "Searching the RPM package below $$RPMTOP ..."; \
     
    943943        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    944944        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
    945         if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
     945        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
    946946        if ! test -d "$$RPMTOP"; then \
    947           RPMTOP=`echo $$HOME/rpmbuild`; \
     947          RPMTOP=/usr/src; \
    948948        fi; \
    949949        echo "Searching the RPM package below $$RPMTOP ..."; \
  • trunk/configure.ac

    r527 r528  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 4.2.2)
     14AM_INIT_AUTOMAKE(samhain, 4.2.3)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST
  • trunk/docs/Changelog

    r526 r528  
     14.2.3:
     2        * fix order of search directories for 'make rpm' (issue reported by
     3        Z. Drableg)
     4
    154.2.2:
    26        * fix bug with PortCheckSkip: for any given port, only first interface
Note: See TracChangeset for help on using the changeset viewer.