randyk 2003/07/01 11:35:28
Modified: win32 Configure.pl
Log:
when running perl_test, don't rerun 'perl Makefile.PL' if already done.
Revision Changes Path
1.7 +20 -12 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Configure.pl 1 Jul 2003 02:21:38 -0000 1.6
+++ Configure.pl 1 Jul 2003 18:35:28 -0000 1.7
@@ -248,8 +248,8 @@
NULL=nul
!ENDIF
-INTDIR=.\libs
-OUTDIR=.\libs
+LIBDIR=.\libs
+PERLGLUE=..\glue\perl
ALL : "$(LIBAPREQ)"
@@ -257,17 +257,20 @@
$(MAKE) /nologo /f $(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32 $(CFG)"
APACHE="$(APACHE)"
CLEAN:
- cd libs
+ cd $(LIBDIR)
$(RM_F) *.pch *.exe *.exp *.lib *.pch *.idb *.so *.dll *.obj
-!IF EXIST("..\glue\perl\Makefile")
- cd ..\..\glue\perl
+ cd ..
+!IF EXIST("$(PERLGLUE)\Makefile")
+ cd $(PERLGLUE)
$(MAKE) /nologo clean
+ cd ..\..\win32
!ENDIF
TEST: $(LIBAPREQ)
$(MAKE) /nologo /f $(TESTALL).mak CFG="$(TESTALL) - Win32 $(CFG)"
APACHE="$(APACHE)"
set PATH=%PATH%;$(APACHE)\bin
- cd $(INTDIR) && $(TESTALL).exe -v
+ cd $(LIBDIR) && $(TESTALL).exe -v
+ cd ..
$(MOD): $(LIBAPREQ)
$(MAKE) /nologo /f $(MOD).mak CFG="$(MOD) - Win32 $(CFG)"
APACHE="$(APACHE)"
@@ -275,11 +278,16 @@
$(CGI): $(LIBAPREQ)
$(MAKE) /nologo /f $(CGI).mak CFG="$(CGI) - Win32 $(CFG)"
APACHE="$(APACHE)"
-PERL_GLUE: $(LIBAPREQ) $(MOD)
- cd ..\glue\perl
+PERL_GLUE: $(MOD)
+ cd $(PERLGLUE)
$(PERL) Makefile.PL
- $(MAKE)
+ $(MAKE) /nologo
+ cd ..\..\win32
-PERL_TEST: PERL_GLUE
- cd ..\glue\perl
- $(MAKE) test
+PERL_TEST: $(MOD)
+ cd $(PERLGLUE)
+!IF !EXIST("$(PERLGLUE)\Makefile")
+ $(PERL) Makefile.PL
+!ENDIF
+ $(MAKE) /nologo test
+ cd ..\..\win32
