Revision: 11399
http://gar.svn.sourceforge.net/gar/?rev=11399&view=rev
Author: skayser
Date: 2010-10-25 18:27:09 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
gar: make calls to mkpackage compatible with absolute GARDIRs
Modified Paths:
--------------
csw/mgar/gar/v2/category.mk
csw/mgar/gar/v2/gar.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/category.mk
===================================================================
--- csw/mgar/gar/v2/category.mk 2010-10-25 16:43:05 UTC (rev 11398)
+++ csw/mgar/gar/v2/category.mk 2010-10-25 18:27:09 UTC (rev 11399)
@@ -2,7 +2,7 @@
# This makefile is to be included from Makefiles in each category
# directory.
-GARDIR ?= gar/
+GARDIR ?= $(abspath gar)
ifeq (,$(wildcard $(GARDIR)/categories/$(CATEGORIES)/category.mk))
$(error The category '$(CATEGORIES)' is invalid. Valid categories are:
$(patsubst $(GARDIR)/categories/%,%,$(wildcard $(GARDIR)/categories/*)))
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2010-10-25 16:43:05 UTC (rev 11398)
+++ csw/mgar/gar/v2/gar.mk 2010-10-25 18:27:09 UTC (rev 11399)
@@ -24,7 +24,7 @@
$(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure
you are using at least 3.81)
endif
-GARDIR ?= gar
+GARDIR ?= $(abspath gar)
GARBIN = $(GARDIR)/bin
DIRSTODOTS = $(subst . /,./,$(patsubst %,/..,$(subst /, ,/$(1))))
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2010-10-25 16:43:05 UTC (rev 11398)
+++ csw/mgar/gar/v2/gar.pkg.mk 2010-10-25 18:27:09 UTC (rev 11399)
@@ -247,7 +247,7 @@
endif
# Where we find our mkpackage global templates
-PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
+PKGLIB = $(GARDIR)/pkglib
PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
