[freetds] [PATCH] Documentation installation fixes

Johnny C. Lam jlam at pkgsrc.org
Sun Mar 23 01:16:48 EDT 2008


The images in doc/images/callout are not installed into the proper
path.  They are currently installed with:

	find $(srcdir)/images -name \*.gif -exec \
		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/images ';'

This installs the files in doc/images/callout into $(TARGET_DOCDIR),
and losing the "callout" component of the path.  However:

	-> cd doc/doc/freetds-0.82RC3/userguide
	-> grep images/callouts/ * | head -1
	samplecode.htm:SRC="../images/callouts/1.gif"

The attached patches fix doc/Makefile.am and doc/Makefile.in to install
the "callouts" images under "callouts" in the target directory.

	Cheers,

	-- Johnny C. Lam
-------------- next part --------------
$NetBSD$

--- doc/Makefile.am.orig	2008-01-08 10:38:23.000000000 -0500
+++ doc/Makefile.am
@@ -55,7 +55,8 @@ man:	$(man_MANS)
 installdirs: 
 	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
 				$(TARGET_DOCDIR)/reference    \
-				$(TARGET_DOCDIR)/images 2>&1
+				$(TARGET_DOCDIR)/images       \
+				$(TARGET_DOCDIR)/images/callouts 2>&1
 
 MANOPTS = -I 'FreeTDS User Guide'  -v 'FreeTDS Utilities' -t $(PRODUCT) -r $(VERSION)
 
@@ -117,8 +118,8 @@ install-data-local: installdirs $(DOCDIR
 	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
 	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
 		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
-	find $(srcdir)/images -name \*.gif -exec \
-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/images ';'
+	cd $(srcdir) && find images -name \*.gif -exec \
+		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
 
 uninstall-local:
 	rm -rf $(TARGET_DOCDIR)
-------------- next part --------------
$NetBSD$

--- doc/Makefile.in.orig	2008-03-12 17:19:16.000000000 -0400
+++ doc/Makefile.in
@@ -566,7 +566,8 @@ man:	$(man_MANS)
 installdirs: 
 	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
 				$(TARGET_DOCDIR)/reference    \
-				$(TARGET_DOCDIR)/images 2>&1
+				$(TARGET_DOCDIR)/images       \
+				$(TARGET_DOCDIR)/images/callouts 2>&1
 
 freebcp.1: freebcp.txt
 	$(TXT2MAN) $(MANOPTS) $(srcdir)/freebcp.txt >.$@
@@ -626,8 +627,8 @@ install-data-local: installdirs $(DOCDIR
 	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
 	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
 		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
-	find $(srcdir)/images -name \*.gif -exec \
-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/images ';'
+	cd $(srcdir) && find images -name \*.gif -exec \
+		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
 
 uninstall-local:
 	rm -rf $(TARGET_DOCDIR)


More information about the FreeTDS mailing list