Skip to content

Commit 98acbca

Browse files
committed
Makefile.SH: factorize install.html target
Avoid duplicate definition of install.man and install.html targets. We could then use in a later commit a Configure option to disable doc installation on demand.
1 parent eaecde9 commit 98acbca

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

Makefile.SH

+16-27
Original file line numberDiff line numberDiff line change
@@ -1177,50 +1177,39 @@ EOT
11771177
done
11781178

11791179
if test "X$hostperl" != X; then
1180+
LOCAL_PERL='$(HOST_PERL)'
11801181
$spitshell >>$Makefile <<'!NO!SUBS!'
11811182
install.perl: $(INSTALL_DEPENDENCE) installperl
11821183
$(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
11831184
-@test ! -s extras.lst || $(MAKE) extras.install
1184-
1185-
install.man: all installman
1186-
$(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
1187-
1188-
# XXX Experimental. Hardwired values, but useful for testing.
1189-
# Eventually Configure could ask for some of these values.
1190-
install.html: all installhtml
1191-
-@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
1192-
$(HOST_PERL) installhtml \
1193-
--podroot=. --podpath=. --recurse \
1194-
--htmldir=$(privlib)/html \
1195-
--htmlroot=$(privlib)/html \
1196-
--splithead=pod/perlipc \
1197-
--splititem=pod/perlfunc \
1198-
--ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
1199-
--verbose
12001185
!NO!SUBS!
12011186
else
1187+
LOCAL_PERL='$(RUN_PERL)'
12021188
$spitshell >>$Makefile <<'!NO!SUBS!'
12031189
install.perl: $(INSTALL_DEPENDENCE) installperl
12041190
$(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
12051191
-@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
12061192
1193+
!NO!SUBS!
1194+
fi
1195+
1196+
$spitshell >>$Makefile <<!GROK!THIS!
12071197
install.man: all installman
1208-
$(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
1198+
${LOCAL_PERL} installman --destdir=\$(DESTDIR) \$(INSTALLFLAGS)
12091199
12101200
# XXX Experimental. Hardwired values, but useful for testing.
12111201
# Eventually Configure could ask for some of these values.
12121202
install.html: all installhtml
1213-
-@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd ..
1214-
$(RUN_PERL) installhtml \
1215-
--podroot=. --podpath=. --recurse \
1216-
--htmldir=$(privlib)/html \
1217-
--htmlroot=$(privlib)/html \
1218-
--splithead=pod/perlipc \
1219-
--splititem=pod/perlfunc \
1220-
--ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \
1203+
-@test -f README.vms && cd vms && \$(LNS) ../README.vms README_vms.pod && cd ..
1204+
${LOCAL_PERL} installhtml \\
1205+
--podroot=. --podpath=. --recurse \\
1206+
--htmldir=\$(privlib)/html \\
1207+
--htmlroot=\$(privlib)/html \\
1208+
--splithead=pod/perlipc \\
1209+
--splititem=pod/perlfunc \\
1210+
--ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \\
12211211
--verbose
1222-
!NO!SUBS!
1223-
fi
1212+
!GROK!THIS!
12241213

12251214
$spitshell >>$Makefile <<'!NO!SUBS!'
12261215

0 commit comments

Comments
 (0)