Skip to content

Commit cbe231e

Browse files
Merge pull request #77 from Project-OSS-Revival/t22
With --disable-gtk-doc switch documentation is not installed #22.
2 parents dc3e9cd + fdeb4fd commit cbe231e

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

devel-docs/Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
132132
test -d $(srcdir)/html || mkdir $(srcdir)/html
133133
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
134134
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
135-
@echo '-- Fixing Crossreferences'
135+
@echo '-- Fixing Crossreferences'
136136
cd $(srcdir) && gtkdoc-fixxref --module=libenca --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
137137
touch html-build.stamp
138138
endif
@@ -145,10 +145,11 @@ clean-local:
145145
maintainer-clean-local: clean
146146
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
147147

148+
if ENABLE_GTK_DOC
148149
install-data-local:
149150
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
150-
(installfiles=`echo $(srcdir)/html/*.html`; \
151-
if test "$$installfiles" = '$(srcdir)/html/*.html'; \
151+
(installfiles=`echo $(srcdir)/html/*.*`; \
152+
if test "$$installfiles" = '$(srcdir)/html/*.*'; \
152153
then echo '-- Nothing to install' ; \
153154
else \
154155
for i in $$installfiles; do \
@@ -160,10 +161,9 @@ install-data-local:
160161
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp2' ; \
161162
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 $(DESTDIR)$(TARGET_DIR); \
162163
fi)
163-
164164
uninstall-local:
165-
(installfiles=`cd $(srcdir)/html >/dev/null && echo *.html`; \
166-
if test "$$installfiles" = '*.html'; \
165+
(installfiles=`cd $(srcdir)/html >/dev/null && echo *.*`; \
166+
if test "$$installfiles" = '*.*'; \
167167
then echo '-- Nothing to uninstall' ; \
168168
else \
169169
for i in $$installfiles; do \
@@ -175,7 +175,7 @@ uninstall-local:
175175
echo '-- Removing $(DOC_MODULE).devhelp2' ; \
176176
rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp2; \
177177
fi)
178-
178+
endif
179179
#
180180
# Require gtk-doc when making dist
181181
#

devel-docs/Makefile.in

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,8 @@ distclean-generic:
469469
maintainer-clean-generic:
470470
@echo "This command is intended for maintainers to use"
471471
@echo "it deletes files that may require special tools to rebuild."
472+
@ENABLE_GTK_DOC_FALSE@install-data-local:
473+
@ENABLE_GTK_DOC_FALSE@uninstall-local:
472474
clean: clean-am
473475

474476
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
@@ -603,7 +605,7 @@ uninstall-am: uninstall-local
603605
@ENABLE_GTK_DOC_TRUE@ test -d $(srcdir)/html || mkdir $(srcdir)/html
604606
@ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
605607
@ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
606-
@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
608+
@ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
607609
@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module=libenca --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
608610
@ENABLE_GTK_DOC_TRUE@ touch html-build.stamp
609611

@@ -615,37 +617,35 @@ clean-local:
615617
maintainer-clean-local: clean
616618
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
617619

618-
install-data-local:
619-
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
620-
(installfiles=`echo $(srcdir)/html/*.html`; \
621-
if test "$$installfiles" = '$(srcdir)/html/*.html'; \
622-
then echo '-- Nothing to install' ; \
623-
else \
624-
for i in $$installfiles; do \
625-
echo '-- Installing '$$i ; \
626-
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
627-
done; \
628-
echo '-- Installing $(srcdir)/html/index.sgml' ; \
629-
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
630-
echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp2' ; \
631-
$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 $(DESTDIR)$(TARGET_DIR); \
632-
fi)
633-
634-
uninstall-local:
635-
(installfiles=`cd $(srcdir)/html >/dev/null && echo *.html`; \
636-
if test "$$installfiles" = '*.html'; \
637-
then echo '-- Nothing to uninstall' ; \
638-
else \
639-
for i in $$installfiles; do \
640-
echo '-- Removing '$$i ; \
641-
rm -f $(DESTDIR)$(TARGET_DIR)/$$i; \
642-
done; \
643-
echo '-- Removing index.sgml' ; \
644-
rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
645-
echo '-- Removing $(DOC_MODULE).devhelp2' ; \
646-
rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp2; \
647-
fi)
648-
620+
@ENABLE_GTK_DOC_TRUE@install-data-local:
621+
@ENABLE_GTK_DOC_TRUE@ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
622+
@ENABLE_GTK_DOC_TRUE@ (installfiles=`echo $(srcdir)/html/*.*`; \
623+
@ENABLE_GTK_DOC_TRUE@ if test "$$installfiles" = '$(srcdir)/html/*.*'; \
624+
@ENABLE_GTK_DOC_TRUE@ then echo '-- Nothing to install' ; \
625+
@ENABLE_GTK_DOC_TRUE@ else \
626+
@ENABLE_GTK_DOC_TRUE@ for i in $$installfiles; do \
627+
@ENABLE_GTK_DOC_TRUE@ echo '-- Installing '$$i ; \
628+
@ENABLE_GTK_DOC_TRUE@ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
629+
@ENABLE_GTK_DOC_TRUE@ done; \
630+
@ENABLE_GTK_DOC_TRUE@ echo '-- Installing $(srcdir)/html/index.sgml' ; \
631+
@ENABLE_GTK_DOC_TRUE@ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
632+
@ENABLE_GTK_DOC_TRUE@ echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp2' ; \
633+
@ENABLE_GTK_DOC_TRUE@ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 $(DESTDIR)$(TARGET_DIR); \
634+
@ENABLE_GTK_DOC_TRUE@ fi)
635+
@ENABLE_GTK_DOC_TRUE@uninstall-local:
636+
@ENABLE_GTK_DOC_TRUE@ (installfiles=`cd $(srcdir)/html >/dev/null && echo *.*`; \
637+
@ENABLE_GTK_DOC_TRUE@ if test "$$installfiles" = '*.*'; \
638+
@ENABLE_GTK_DOC_TRUE@ then echo '-- Nothing to uninstall' ; \
639+
@ENABLE_GTK_DOC_TRUE@ else \
640+
@ENABLE_GTK_DOC_TRUE@ for i in $$installfiles; do \
641+
@ENABLE_GTK_DOC_TRUE@ echo '-- Removing '$$i ; \
642+
@ENABLE_GTK_DOC_TRUE@ rm -f $(DESTDIR)$(TARGET_DIR)/$$i; \
643+
@ENABLE_GTK_DOC_TRUE@ done; \
644+
@ENABLE_GTK_DOC_TRUE@ echo '-- Removing index.sgml' ; \
645+
@ENABLE_GTK_DOC_TRUE@ rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
646+
@ENABLE_GTK_DOC_TRUE@ echo '-- Removing $(DOC_MODULE).devhelp2' ; \
647+
@ENABLE_GTK_DOC_TRUE@ rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp2; \
648+
@ENABLE_GTK_DOC_TRUE@ fi)
649649
#
650650
# Require gtk-doc when making dist
651651
#

0 commit comments

Comments
 (0)