Attachment #93182 for bug #131040

Lines 6-12 Link Here

(-)b/sysutils/cfengine/Makefile (-2 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= cfengine	8	PORTNAME= cfengine
9	PORTVERSION= 2.2.8	9	PORTVERSION= 2.2.9
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.cfengine.org/downloads/	11	MASTER_SITES= http://www.cfengine.org/downloads/
12		12
Lines 27-33 CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ Link Here
27	BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \	27	BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
28	BERKELEY_DB_LIB=-l${BDB_LIB_NAME}	28	BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
29	.if !defined(NOPORTDOCS)	29	.if !defined(NOPORTDOCS)
30	INFO= cfengine-Tutorial cfengine-Reference	30	INFO= cfengine-Tutorial cfengine-Reference cfengine-Anomalies
31	.endif	31	.endif
32		32
33	MAN8= cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \	33	MAN8= cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
Lines 36-41 MAN8= cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \ Link Here
36	cfrun.8 cfservd.8 cfshow.8	36	cfrun.8 cfservd.8 cfshow.8
37		37
38	post-patch:	38	post-patch:
		39	@${SED} \
		40	-e's\|@@BDB_INCLUDE_DIR@@\|${BDB_INCLUDE_DIR}\|g' \
		41	-e's\|@@BDB_LIB_DIR@@\|${BDB_LIB_DIR}\|g' \
		42	-e's\|@@BDB_LIB_NAME@@\|${BDB_LIB_NAME}\|g' \
		43	${FILESDIR}/configure-patch.in \| \
		44	${PATCH} -s -p0 -d ${WRKSRC}
39	@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \	45	@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \
40	-e s,-lpthread,${PTHREAD_LIBS},g \	46	-e s,-lpthread,${PTHREAD_LIBS},g \
41	-e s,lpthread,${PTHREAD_LIBS},g \	47	-e s,lpthread,${PTHREAD_LIBS},g \

Lines 1-3 Link Here

(-)b/sysutils/cfengine/distinfo (-3 / +3 lines)
1	MD5 (cfengine-2.2.8.tar.gz) = 8881c3c350f36b35845cdb1e6e53b8a1	1	MD5 (cfengine-2.2.9.tar.gz) = ce115587078a7a8345dca52891f95513
2	SHA256 (cfengine-2.2.8.tar.gz) = 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8	2	SHA256 (cfengine-2.2.9.tar.gz) = 98489dd49a15c4e6f2065435d415a4a5d0b79d67b10478eeb0a0de579a6bade2
3	SIZE (cfengine-2.2.8.tar.gz) = 2715678	3	SIZE (cfengine-2.2.9.tar.gz) = 2933246




--- configure.orig	2009-01-27 11:01:36.000000000 +0300
+++ configure	2009-01-27 11:15:37.000000000 +0300
@@ -24100,111 +24100,20 @@
 
     if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
 
-        for d in $prefix /opt /usr/local /usr; do
-            for v in db-4 db4 db3 db db40; do
-
-                if test -f "$d/include/$v/db.h" ; then
-                    echo "Found header in $d/include/$v "
-                    test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
-                    BERKELEY_DB_CFLAGS="-I$d/include/$v"
+        # Dummy loops: we do know where BDB is.
+        for d in dummy_dir; do
+            for v in dummy_ver; do
+
+                if test -f "@@BDB_INCLUDE_DIR@@/db.h" ; then
+                    echo "Found header in @@BDB_INCLUDE_DIR@@ "
+                    BERKELEY_DB_LDFLAGS="-L@@BDB_LIB_DIR@@"
+                    BERKELEY_DB_CFLAGS="-I@@BDB_INCLUDE_DIR@@"
                     late_LIBS=$LIBS
-		    # In RedHat 8, for instance, we have /usr/include/db4
-		    # and libdb-4.0.a.  Debian has /usr/lib/libdb-4.1.a, for
-		    # instance.  Look for the appropriate library.
-                    if test $v = db4 -o $v = db40; then
-			save_CFLAGS="$CFLAGS"
-			save_LDFLAGS="$LDFLAGS"
-			CFLAGS="$CFLAGS $BERKELEY_DB_CFLAGS"
-			LDFLAGS="$LDFLAGS $BERKELEY_DB_LDFLAGS"
-			{ echo "$as_me:$LINENO: checking for library containing db_create" >&5
-echo $ECHO_N "checking for library containing db_create... $ECHO_C" >&6; }
-if test "${ac_cv_search_db_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' db-4 db4 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_db_create=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_db_create+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_db_create+set}" = set; then
-  :
-else
-  ac_cv_search_db_create=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_db_create" >&5
-echo "${ECHO_T}$ac_cv_search_db_create" >&6; }
-ac_res=$ac_cv_search_db_create
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  BERKELEY_DB_LIB=$ac_cv_search_db_create
-fi
-
-			CFLAGS="$save_CFLAGS"
-			LDFLAGS="$save_LDFLAGS"
-		    else
-                    	BERKELEY_DB_LIB="-l$v"
-                    fi
+		    # Check for db4, libdb-4.0.a and libdb-4.1.a was
+		    # eliminated: not needed for FreeBSD port.
+                    BERKELEY_DB_LIB="-l@@BDB_LIB_NAME@@"
 		    LIBS=$late_LIBS
+		    d=@@BDB_INCLUDE_DIR@@
                     { echo "$as_me:$LINENO: result: $d" >&5
 echo "${ECHO_T}$d" >&6; }
                     break




--- doc/Makefile.in.orig	2008-12-24 17:42:47.000000000 +0300
+++ doc/Makefile.in	2009-01-27 10:53:50.000000000 +0300
@@ -220,7 +220,7 @@
 man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  cfrun.8  cfservd.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 
 
 # Info used in building the Info files
-info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
+info_TEXINFOS =
 infofiles = $(info_TEXINFOS:.texinfo=.info)
 MAKEINFOHTML = $(MAKEINFO) --html --no-split --css-include=cfcomdoc.css 
 
@@ -543,6 +543,7 @@
 	done
 
 dist-info: $(INFO_DEPS)

 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
@@ -559,6 +560,7 @@
 	    else :; fi; \
 	  done; \
 	done

 
 mostlyclean-aminfo:
 	-rm -rf cfengine-Reference.aux cfengine-Reference.cp cfengine-Reference.cps \
@@ -648,6 +650,7 @@
 	done
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)

 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -655,6 +658,7 @@
 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
 	done

 
 uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
@@ -665,6 +669,7 @@
 	done
 install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)

 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(html_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -672,6 +677,7 @@
 	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
 	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
 	done

 
 uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
@@ -808,6 +814,7 @@
 install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)

 	@$(NORMAL_INSTALL)
 	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -837,6 +844,7 @@
 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
 	  done; \
 	else : ; fi
- 

Return to bug 131040

Added Link Here

(-)b/sysutils/cfengine/files/configure-patch.in (+126 lines)
1	--- configure.orig 2009-01-27 11:01:36.000000000 +0300
2	+++ configure 2009-01-27 11:15:37.000000000 +0300
3	@@ -24100,111 +24100,20 @@
4
5	if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
6
7	- for d in $prefix /opt /usr/local /usr; do
8	- for v in db-4 db4 db3 db db40; do
9	-
10	- if test -f "$d/include/$v/db.h" ; then
11	- echo "Found header in $d/include/$v "
12	- test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
13	- BERKELEY_DB_CFLAGS="-I$d/include/$v"
14	+ # Dummy loops: we do know where BDB is.
15	+ for d in dummy_dir; do
16	+ for v in dummy_ver; do
17	+
18	+ if test -f "@@BDB_INCLUDE_DIR@@/db.h" ; then
19	+ echo "Found header in @@BDB_INCLUDE_DIR@@ "
20	+ BERKELEY_DB_LDFLAGS="-L@@BDB_LIB_DIR@@"
21	+ BERKELEY_DB_CFLAGS="-I@@BDB_INCLUDE_DIR@@"
22	late_LIBS=$LIBS
23	- # In RedHat 8, for instance, we have /usr/include/db4
24	- # and libdb-4.0.a. Debian has /usr/lib/libdb-4.1.a, for
25	- # instance. Look for the appropriate library.
26	- if test $v = db4 -o $v = db40; then
27	- save_CFLAGS="$CFLAGS"
28	- save_LDFLAGS="$LDFLAGS"
29	- CFLAGS="$CFLAGS $BERKELEY_DB_CFLAGS"
30	- LDFLAGS="$LDFLAGS $BERKELEY_DB_LDFLAGS"
31	- { echo "$as_me:$LINENO: checking for library containing db_create" >&5
32	-echo $ECHO_N "checking for library containing db_create... $ECHO_C" >&6; }
33	-if test "${ac_cv_search_db_create+set}" = set; then
34	- echo $ECHO_N "(cached) $ECHO_C" >&6
35	-else
36	- ac_func_search_save_LIBS=$LIBS
37	-cat >conftest.$ac_ext <<_ACEOF
38	-/* confdefs.h. */
39	-_ACEOF
40	-cat confdefs.h >>conftest.$ac_ext
41	-cat >>conftest.$ac_ext <<_ACEOF
42	-/* end confdefs.h. */
43	-
44	-/* Override any GCC internal prototype to avoid an error.
45	- Use char because int might match the return type of a GCC
46	- builtin and then its argument prototype would still apply. */
47	-#ifdef __cplusplus
48	-extern "C"
49	-#endif
50	-char db_create ();
51	-int
52	-main ()
53	-{
54	-return db_create ();
55	- ;
56	- return 0;
57	-}
58	-_ACEOF
59	-for ac_lib in '' db-4 db4 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
60	- if test -z "$ac_lib"; then
61	- ac_res="none required"
62	- else
63	- ac_res=-l$ac_lib
64	- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
65	- fi
66	- rm -f conftest.$ac_objext conftest$ac_exeext
67	-if { (ac_try="$ac_link"
68	-case "(($ac_try" in
69	- \" \| \` \| \\) ac_try_echo=\$ac_try;;
70	- *) ac_try_echo=$ac_try;;
71	-esac
72	-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
73	- (eval "$ac_link") 2>conftest.er1
74	- ac_status=$?
75	- grep -v '^ *+' conftest.er1 >conftest.err
76	- rm -f conftest.er1
77	- cat conftest.err >&5
78	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
79	- (exit $ac_status); } && {
80	- test -z "$ac_c_werror_flag" \|\|
81	- test ! -s conftest.err
82	- } && test -s conftest$ac_exeext &&
83	- $as_test_x conftest$ac_exeext; then
84	- ac_cv_search_db_create=$ac_res
85	-else
86	- echo "$as_me: failed program was:" >&5
87	-sed 's/^/\| /' conftest.$ac_ext >&5
88	-
89	-
90	-fi
91	-
92	-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
93	- conftest$ac_exeext
94	- if test "${ac_cv_search_db_create+set}" = set; then
95	- break
96	-fi
97	-done
98	-if test "${ac_cv_search_db_create+set}" = set; then
99	- :
100	-else
101	- ac_cv_search_db_create=no
102	-fi
103	-rm conftest.$ac_ext
104	-LIBS=$ac_func_search_save_LIBS
105	-fi
106	-{ echo "$as_me:$LINENO: result: $ac_cv_search_db_create" >&5
107	-echo "${ECHO_T}$ac_cv_search_db_create" >&6; }
108	-ac_res=$ac_cv_search_db_create
109	-if test "$ac_res" != no; then
110	- test "$ac_res" = "none required" \|\| LIBS="$ac_res $LIBS"
111	- BERKELEY_DB_LIB=$ac_cv_search_db_create
112	-fi
113	-
114	- CFLAGS="$save_CFLAGS"
115	- LDFLAGS="$save_LDFLAGS"
116	- else
117	- BERKELEY_DB_LIB="-l$v"
118	- fi
119	+ # Check for db4, libdb-4.0.a and libdb-4.1.a was
120	+ # eliminated: not needed for FreeBSD port.
121	+ BERKELEY_DB_LIB="-l@@BDB_LIB_NAME@@"
122	LIBS=$late_LIBS
123	+ d=@@BDB_INCLUDE_DIR@@
124	{ echo "$as_me:$LINENO: result: $d" >&5
125	echo "${ECHO_T}$d" >&6; }
126	break

Lines 1-15 Link Here

(-)b/sysutils/cfengine/files/patch-doc_Makefile.in (-14 / +13 lines)
1	--- doc/Makefile.in.orig 2008-08-04 21:55:47.000000000 +0400	1	--- doc/Makefile.in.orig 2008-12-24 17:42:47.000000000 +0300
2	+++ doc/Makefile.in 2008-08-08 02:18:39.000000000 +0400	2	+++ doc/Makefile.in 2009-01-27 10:53:50.000000000 +0300
3	@@ -214,7 +214,7 @@	3	@@ -220,7 +220,7 @@
4	man_MANS = cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8	4	man_MANS = cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8
5		5
6	# Info used in building the Info files	6	# Info used in building the Info files
7	-info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo # cfengine-Anomalies.texinfo	7	-info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
8	+info_TEXINFOS =	8	+info_TEXINFOS =
9	infofiles = $(info_TEXINFOS:.texinfo=.info)	9	infofiles = $(info_TEXINFOS:.texinfo=.info)
10	MAKEINFOHTML = $(MAKEINFO) --html --css-include=cfcomdoc.css --no-split	10	MAKEINFOHTML = $(MAKEINFO) --html --no-split --css-include=cfcomdoc.css
11		11
12	@@ -476,6 +476,7 @@	12	@@ -543,6 +543,7 @@
13	done	13	done
14		14
15	dist-info: $(INFO_DEPS)	15	dist-info: $(INFO_DEPS)
Lines 17-23 Link Here
17	@srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; \	17	@srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; \
18	list='$(INFO_DEPS)'; \	18	list='$(INFO_DEPS)'; \
19	for base in $$list; do \	19	for base in $$list; do \
20	@@ -492,6 +493,7 @@	20	@@ -559,6 +560,7 @@
21	else :; fi; \	21	else :; fi; \
22	done; \	22	done; \
23	done	23	done
Lines 25-31 Link Here
25		25
26	mostlyclean-aminfo:	26	mostlyclean-aminfo:
27	-rm -rf cfengine-Reference.aux cfengine-Reference.cp cfengine-Reference.cps \	27	-rm -rf cfengine-Reference.aux cfengine-Reference.cp cfengine-Reference.cps \
28	@@ -570,6 +572,7 @@	28	@@ -648,6 +650,7 @@
29	done	29	done
30	install-docDATA: $(doc_DATA)	30	install-docDATA: $(doc_DATA)
31	@$(NORMAL_INSTALL)	31	@$(NORMAL_INSTALL)
Lines 33-39 Link Here
33	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"	33	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
34	@list='$(doc_DATA)'; for p in $$list; do \	34	@list='$(doc_DATA)'; for p in $$list; do \
35	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	35	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
36	@@ -577,6 +580,7 @@	36	@@ -655,6 +658,7 @@
37	echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \	37	echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
38	$(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \	38	$(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
39	done	39	done
Lines 41-47 Link Here
41		41
42	uninstall-docDATA:	42	uninstall-docDATA:
43	@$(NORMAL_UNINSTALL)	43	@$(NORMAL_UNINSTALL)
44	@@ -587,6 +591,7 @@	44	@@ -665,6 +669,7 @@
45	done	45	done
46	install-htmlDATA: $(html_DATA)	46	install-htmlDATA: $(html_DATA)
47	@$(NORMAL_INSTALL)	47	@$(NORMAL_INSTALL)
Lines 49-55 Link Here
49	test -z "$(htmldir)" \|\| $(MKDIR_P) "$(DESTDIR)$(htmldir)"	49	test -z "$(htmldir)" \|\| $(MKDIR_P) "$(DESTDIR)$(htmldir)"
50	@list='$(html_DATA)'; for p in $$list; do \	50	@list='$(html_DATA)'; for p in $$list; do \
51	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	51	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
52	@@ -594,6 +599,7 @@	52	@@ -672,6 +677,7 @@
53	echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \	53	echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
54	$(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \	54	$(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
55	done	55	done
Lines 57-63 Link Here
57		57
58	uninstall-htmlDATA:	58	uninstall-htmlDATA:
59	@$(NORMAL_UNINSTALL)	59	@$(NORMAL_UNINSTALL)
60	@@ -730,6 +736,7 @@	60	@@ -808,6 +814,7 @@
61	install-info: install-info-am	61	install-info: install-info-am
62		62
63	install-info-am: $(INFO_DEPS)	63	install-info-am: $(INFO_DEPS)
Lines 65-71 Link Here
65	@$(NORMAL_INSTALL)	65	@$(NORMAL_INSTALL)
66	test -z "$(infodir)" \|\| $(MKDIR_P) "$(DESTDIR)$(infodir)"	66	test -z "$(infodir)" \|\| $(MKDIR_P) "$(DESTDIR)$(infodir)"
67	@srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; \	67	@srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`; \
68	@@ -759,6 +766,7 @@	68	@@ -837,6 +844,7 @@
69	install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" \|\| :;\	69	install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" \|\| :;\
70	done; \	70	done; \
71	else : ; fi	71	else : ; fi
72	-