diff options
| author | Nicholas Clark <nick@ccl4.org> | 2013-07-03 22:50:08 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-07-07 12:42:02 +0200 |
| commit | 0827416ddd18f3894cff2e82930c4f441b56e4a8 (patch) | |
| tree | 89276cff41763b241f151daf97dccb6bc47b723d /win32 | |
| parent | 145bbcacfa5da244463c1a32e9230278dd2eff31 (diff) | |
| download | perl-0827416ddd18f3894cff2e82930c4f441b56e4a8.tar.gz | |
Generate utils/Makefile from utils/Makefile.PL, and remove it at clean time.
Add rules to the Win32 Makefiles to call utils/Makefile.PL to generate
utils/Makefile, and rules to both them and the *nix Makefile to delete
the generated file as part of the cleanup targets.
VMS continues to do its own thing, rather than using utils/Makefile.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 6 | ||||
| -rw-r--r-- | win32/makefile.mk | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/win32/Makefile b/win32/Makefile index deec493880..521db489ae 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1115,10 +1115,13 @@ doc: $(PERLEXE) ..\pod\perltoc.pod --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML::=|)" \ --recurse +..\utils\Makefile: $(CONFIGPM) ..\utils\Makefile.PL + $(MINIPERL) -I..\lib ..\utils\Makefile.PL .. + # Note that this next section is parsed (and regenerated) by pod/buildtoc # so please check that script before making structural changes here -utils: $(PERLEXE) $(X2P) +utils: $(PERLEXE) $(X2P) ..\utils\Makefile cd ..\utils $(MAKE) PERL=$(MINIPERL) cd ..\pod @@ -1269,6 +1272,7 @@ distclean: realclean -cd $(EXTDIR) && del /s *.def Makefile Makefile.old -cd $(DISTDIR) && del /s *.def Makefile Makefile.old -cd $(CPANDIR) && del /s *.def Makefile Makefile.old + -del /s ..\utils\Makefile -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) -if exist $(COREDIR) rmdir /s /q $(COREDIR) -if exist pod2htmd.tmp del pod2htmd.tmp diff --git a/win32/makefile.mk b/win32/makefile.mk index c6a23fd2b8..6a9d6209f1 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1295,9 +1295,12 @@ doc: $(PERLEXE) ..\pod\perltoc.pod --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\ --recurse +..\utils\Makefile: $(CONFIGPM) ..\utils\Makefile.PL + $(MINIPERL) -I..\lib ..\utils\Makefile.PL .. + # Note that this next section is parsed (and regenerated) by pod/buildtoc # so please check that script before making structural changes here -utils: $(PERLEXE) $(X2P) +utils: $(PERLEXE) $(X2P) ..\utils\Makefile cd ..\utils && $(MAKE) PERL=$(MINIPERL) copy ..\README.aix ..\pod\perlaix.pod copy ..\README.amiga ..\pod\perlamiga.pod @@ -1445,6 +1448,7 @@ distclean: realclean -cd $(EXTDIR) && del /s *.def Makefile Makefile.old -cd $(DISTDIR) && del /s *.def Makefile Makefile.old -cd $(CPANDIR) && del /s *.def Makefile Makefile.old + -del /s ..\utils\Makefile -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) -if exist $(COREDIR) rmdir /s /q $(COREDIR) -if exist pod2htmd.tmp del pod2htmd.tmp |