Skip to Content.
Sympa Menu

freetds - Re: [freetds] Status: 0.82 RELEASED

freetds AT lists.ibiblio.org

Subject: FreeTDS Development Group

List archive

Chronological Thread  
  • From: "James K. Lowden" <jklowden AT freetds.org>
  • To: FreeTDS Development Group <freetds AT lists.ibiblio.org>
  • Subject: Re: [freetds] Status: 0.82 RELEASED
  • Date: Thu, 8 May 2008 14:39:43 -0400

Johnny C. Lam wrote:
>
> nobase_data_DATA = $(DOCDIR)/reference/index.html \
> $(DOCDIR)/userguide/index.htm
>
> "nobase_data_DATA" is the wrong variable to use here because those files
>
> are ultimately installed (along with the rest of the documentation) by
> the custom "install-data-local" target in doc/Makefile.am. Use
> "noinst_DATA" instead so that the files aren't installed by any standard
>
> target.

Committed change according to your instructions to CVS HEAD.

$ cvs diff -r 1.63 doc/Makefile.am
jklowden AT freetds.cvs.sourceforge.net's password:
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/doc/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- doc/Makefile.am 23 Mar 2008 17:29:57 -0000 1.63
+++ doc/Makefile.am 8 May 2008 18:37:21 -0000 1.64
@@ -2,7 +2,7 @@
# Converting DocBook to HTML (several small files)
# http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140

-# $Id: Makefile.am,v 1.63 2008/03/23 17:29:57 jklowden Exp $
+# $Id: Makefile.am,v 1.64 2008/05/08 18:37:21 jklowden Exp $

SHELL = /bin/sh
TXT2MAN = $(srcdir)/txt2man
@@ -40,7 +40,7 @@
man_MANS = freebcp.1 tsql.1 osql.1 bsqldb.1 bsqlodbc.1 defncopy.1
datacopy.1 fisql.1 \
freetds.conf.5

-nobase_data_DATA = $(DOCDIR)/reference/index.html
$(DOCDIR)/userguide/index.htm
+noinst_DATA = $(DOCDIR)/reference/index.html
$(DOCDIR)/userguide/index.htm

$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm

@@ -110,7 +110,7 @@

# If we built the documentation ourselves, install that,
# else if we have access to distributed documentation, install that.
-install-data-local: installdirs $(DOCDIR)/reference/index.html
$(DOCDIR)/userguide/index.htm
+install-data-local: installdirs $(noinst_DATA)
$(mkinstalldirs) $(DOCDIR) 2>&1
if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi;
\
find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \


Let me know if that's not right.

--jkl




Archive powered by MHonArc 2.6.24.

Top of Page