[csw-devel] SF.net SVN: gar:[15514] csw/mgar/pkg/logrotate/trunk/Makefile

[igalic at users.sourceforge.net]

Revision: 15514
          http://gar.svn.sourceforge.net/gar/?rev=15514&view=rev
Author:   igalic
Date:     2011-09-04 09:46:49 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Fix logrotate build accross platforms by moving the variable assignment *below* the gar include.

Modified Paths:
--------------
    csw/mgar/pkg/logrotate/trunk/Makefile

Modified: csw/mgar/pkg/logrotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logrotate/trunk/Makefile	2011-09-04 03:07:10 UTC (rev 15513)
+++ csw/mgar/pkg/logrotate/trunk/Makefile	2011-09-04 09:46:49 UTC (rev 15514)
@@ -6,7 +6,7 @@
 VERSION = 3.8.1
 CATEGORIES = apps
 
-DESCRIPTION = rotates, compresses, and mails system logs
+DESCRIPTION = Rotates, compresses, and mails system logs
 
 define BLURB
    The logrotate utility is designed to simplify the administration of log files on a system which generates a lot of log files.
@@ -19,10 +19,12 @@
 
 PATCHFILES += 003-test.patch
 PATCHFILES += 005-gzippath.patch
+PATCHFILES += 006-mbrtowc_empty.patch
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += 003-test.patch
 DISTFILES += 005-gzippath.patch
+DISTFILES += 006-mbrtowc_empty.patch
 
 RUNTIME_DEP_PKGS = CSWlibpopt
 BUILD_DEP_PKGS   = $(RUNTIME_DEP_PKGS)
@@ -30,19 +32,16 @@
 CONFIGURE_SCRIPTS =
 TEST_TARGET = test
 
-# "optimize"
-NOISALIST = 1
-
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-# Don't ask, it doesn't work otherwise.
-export EXTRA_CFLAGS = -I$(includedir)
-export EXTRA_LDFLAGS = -L$(libdir)
+include gar/category.mk
+
+export EXTRA_CFLAGS := $(CFLAGS) $(CPPFLAGS)
+export EXTRA_LDFLAGS := $(LDFLAGS)
 export PREFIX = $(DESTDIR)
 export BASEDIR = $(prefix)
 export MANDIR = $(mandir)
 
-include gar/category.mk
 
 # This is a hack, as I have no idea what's going wrong.
 pre-test-modulated:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.