distcheck fixes

Original commit message from CVS:
distcheck fixes
This commit is contained in:
David Schleef 2003-11-29 04:36:56 +00:00
parent 28397c507c
commit 7eb1bbbaa0
3 changed files with 48 additions and 17 deletions

View file

@ -214,14 +214,21 @@ distclean-local: clean
if DOC_HTML if DOC_HTML
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \ then echo '-- Nothing to install' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
echo '-- Installing '$$i ; \ echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \ done; \
pngfiles=`echo ./html/*.png`; \
if test "$$pngfiles" != './html/*.png'; then \
for i in $$pngfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
fi; \
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \ echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
@ -229,8 +236,8 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi) fi)
uninstall-local: uninstall-local:
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to uninstall' ; \ then echo '-- Nothing to uninstall' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
@ -238,6 +245,14 @@ uninstall-local:
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
done; \ done; \
pngfiles=`echo ./html/*.png`; \
if test "$$pngfiles" != './html/*.png'; then \
for i in $$pngfiles; do \
rmfile=`basename $$i` ; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
done; \
fi; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \

View file

@ -212,24 +212,31 @@ distclean-local: clean
if DOC_HTML if DOC_HTML
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to install' ; \ then echo '-- Nothing to install' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
echo '-- Installing '$$i ; \ echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \ done; \
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \ pngfiles=`echo ./html/*.png`; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \ if test "$$pngfiles" != './html/*.png'; then \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ for i in $$pngfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
fi; \
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi) fi)
uninstall-local: uninstall-local:
(installfiles=`echo $(srcdir)/html/*.html $(srcdir)/html/*.png`; \ (installfiles=`echo ./html/*.html`; \
if test "$$installfiles" = '$(srcdir)/html/*.html'; \ if test "$$installfiles" = './html/*.html'; \
then echo '-- Nothing to uninstall' ; \ then echo '-- Nothing to uninstall' ; \
else \ else \
for i in $$installfiles; do \ for i in $$installfiles; do \
@ -237,6 +244,14 @@ uninstall-local:
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \ rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
done; \ done; \
pngfiles=`echo ./html/*.png`; \
if test "$$pngfiles" != './html/*.png'; then \
for i in $$pngfiles; do \
rmfile=`basename $$i` ; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
done; \
fi; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \ rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \

View file

@ -94,7 +94,7 @@ $(BUILDDIR)/$(MAIN): $(XML) $(CSS)
html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC)
@echo "*** Generating HTML output ***" @echo "*** Generating HTML output ***"
@-mkdir -p html @-mkdir -p html
@cp $(srcdir)/../image-png $(BUILDDIR)/image.entities @cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities
@cd $(BUILDDIR) && xmlto html -o ../html $(MAIN) @cd $(BUILDDIR) && xmlto html -o ../html $(MAIN)
@test "x$(CSS)" != "x" && \ @test "x$(CSS)" != "x" && \
echo "Copying .css files: $(CSS)" && \ echo "Copying .css files: $(CSS)" && \
@ -106,8 +106,9 @@ html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC)
$(DOC).ps: $(BUILDDIR)/$(MAIN) $(EPS_BUILT) $(PNG_SRC) $(FIG_SRC) $(DOC).ps: $(BUILDDIR)/$(MAIN) $(EPS_BUILT) $(PNG_SRC) $(FIG_SRC)
@echo "*** Generating PS output ***" @echo "*** Generating PS output ***"
@cp $(srcdir)/../image-eps $(BUILDDIR)/image.entities @cp -f $(srcdir)/../image-eps $(BUILDDIR)/image.entities
export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(MAIN) cd $(BUILDDIR) && docbook2ps -o .. $(MAIN)
# export LC_PAPER=$(PAPER_LOCALE) && cd $(BUILDDIR) && xmlto ps -o .. $(MAIN)
$(DOC).pdf: $(DOC).ps $(DOC).pdf: $(DOC).ps
@echo "*** Generating PDF output ***" @echo "*** Generating PDF output ***"
@ -115,7 +116,7 @@ $(DOC).pdf: $(DOC).ps
#$(DOC).pdf: $(MAIN) $(PDF) $(FIG_SRC) #$(DOC).pdf: $(MAIN) $(PDF) $(FIG_SRC)
# @echo "*** Generating PDF output ***" # @echo "*** Generating PDF output ***"
# @cp $(srcdir)/../image-pdf image.entities # @cp -f $(srcdir)/../image-pdf image.entities
# @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN) # @export LC_PAPER=$(PAPER_LOCALE) && xmlto pdf $(MAIN)
# @rm image.entities # @rm image.entities