ispman Makefile, 1.75.2.1, 1.75.2.2 configure, 1.10, 1.10.4.1

Update of /cvsroot/ispman/ispman
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27827

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	Makefile configure 
Log Message:
Merged to current HEAD, still needs debuging though.


Index: Makefile
===================================================================
RCS file: /cvsroot/ispman/ispman/Makefile,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -u -d -r1.75.2.1 -r1.75.2.2
--- Makefile	11 Sep 2006 21:46:54 -0000	1.75.2.1
+++ Makefile	2 Oct 2006 08:09:38 -0000	1.75.2.2
@@ -13,23 +13,23 @@
 
 # generate schema files
 schema:
-	make -C install-data/schema all
+	$(MAKE) -C install-data/schema all
 
 # generate prime-ldif 
 ldif:
-	make -C install-data/ldifs all
+	$(MAKE) -C install-data/ldifs all
 
 
 # install schema files
 install-schema:
 	@echo Installing LDAP schema files
-	make -C install-data/schema install
+	$(MAKE) -C install-data/schema install
 
 
 # install prime-ldif
 install-ldif:
 	@echo Installing prime LDIF file
-	make -C install-data/ldifs install
+	$(MAKE) -C install-data/ldifs install
 
 
 # prepare ispman files
@@ -147,9 +147,9 @@
 
 # cleanup generated files
 clean:
-	make -C install-data/schema clean
-	make -C install-data/ldifs clean
-	cd contrib/perl && make clean
+	$(MAKE) -C install-data/schema clean
+	$(MAKE) -C install-data/ldifs clean
+	cd contrib/perl && $(MAKE) clean
 
 # remove any leftover files too
 realclean: clean

Index: configure
===================================================================
RCS file: /cvsroot/ispman/ispman/configure,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -d -r1.10 -r1.10.4.1
--- configure	1 Aug 2004 21:20:35 -0000	1.10
+++ configure	2 Oct 2006 08:09:38 -0000	1.10.4.1
@@ -5,6 +5,7 @@
 
 GetOptions(
     'prefix=s' => \$prefix,
+    'make=s' => \$make,
     'help'     => \&help
   )
   || help();
@@ -17,11 +18,13 @@
 }
 
 $prefix ||= "/opt/ispman";
+$make ||= "make";
 
 sub help {
     print qq|
 Installation layout options:
  --prefix=PREFIX        install allfiles under this PREFIX[/opt/ispman]
+ --make=PATH_TO_MAKE	use a different make. i-e gmake
 |;
     exit;
 }
@@ -35,16 +38,23 @@
 
 open F, "> makedefs";
 my $seen_ispman_install_path = 0;
+my $seen_make = 0;
 for (@lines) {
     if (/PREFIX/) {
         $seen_ispman_install_path = 1;
         print F "PREFIX=$prefix\n";
-    }
-    else {
+    } elsif (/MAKE/){
+	$seen_make=1;
+        print F "MAKE=$make\n";
+    } else {
         print F "$_";
     }
 }
 print F "PREFIX=$prefix\n" unless $seen_ispman_install_path;
+print F "MAKE=$$make\n" unless $seen_make;
+
+
+
 close("F");
 
 print "Now please run make\n";


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV