wilde: server/perl-kolab MANIFEST, 1.8, 1.8.2.1 Makefile.PL, 1.14.2.1, 1.14.2.2

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv21750/perl-kolab

Modified Files:
      Tag: kolab_2_2_branch
	MANIFEST Makefile.PL 
Log Message:
Replaced (ab)use of $HOME in Makefiles by new var KOLABDIR.
This is determined by asking the openpkg package for its INSTALLPREFIX.
To make this and subsequent changes easier a new source wide make includefile
kolab.mk was implemented.

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- MANIFEST	10 Feb 2009 13:45:49 -0000	1.8
+++ MANIFEST	9 Nov 2009 14:23:55 -0000	1.8.2.1
@@ -22,5 +22,6 @@
 lib/Kolab/LDAP/Backend/fds.pm
 lib/Kolab/Util.pm
 Makefile.PL
+kolab.mk
 MANIFEST
 README

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- Makefile.PL	20 Mar 2009 10:23:31 -0000	1.14.2.1
+++ Makefile.PL	9 Nov 2009 14:23:55 -0000	1.14.2.2
@@ -4,6 +4,7 @@
 
 use ExtUtils::MakeMaker;
 use Getopt::Long;
+use File::Copy;
 
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab';
@@ -95,8 +96,13 @@
 }
 
 sub MY::postamble {
-    
-    my $add = "bin/%: bin/%.in
+    if (-e "../kolab.mk")
+    {
+	copy("../kolab.mk", "./") or die "Could not copy ../kolab.mk";
+    }
+    my $add = "include kolab.mk
+
+bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
@@ -119,20 +125,20 @@
 	done
 
 ifeq \"x\$(RPM)\" \"x\"
-  RPM = \$(HOME)/bin/openpkg rpm
+  RPM = \$(KOLABDIR)/bin/openpkg rpm
 endif
 ifeq \"x\$(KOLABRPMSRC)\" \"x\"
-  KOLABRPMSRC = \$(HOME)/RPM/SRC
+  KOLABRPMSRC = \$(KOLABDIR)/RPM/SRC
 endif
 ifeq \"x\$(KOLABRPMPKG)\" \"x\"
-  KOLABRPMPKG = \$(HOME)/RPM/PKG
+  KOLABRPMPKG = \$(KOLABDIR)/RPM/PKG
 endif
 ifeq \"x\$(KOLABRPMTMP)\" \"x\"
-  KOLABRPMTMP = \$(HOME)/RPM/TMP
+  KOLABRPMTMP = \$(KOLABDIR)/RPM/TMP
 endif
 
 ifeq \"x\$(PLATTAG)\" \"x\"
-	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(HOME:/%=%)
+	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(KOLABDIR:/%=%)
 endif
 
 PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')