Check-in [92591e0f1e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Really fix info/dir leftovers
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 92591e0f1e9f8f8140d82b89d18ee7fe78043b92
User & Date: bapt 2013-09-22 09:56:32
Context
2013-09-22
18:27
Compress all manpages in manpath check-in: 31fd5b44cf user: bapt tags: trunk
09:56
Really fix info/dir leftovers check-in: 92591e0f1e user: bapt tags: trunk
01:16
Fix info pages and a couple of bugs with EXAMPLESDIR and DATADIR check-in: ee56f78ccd user: bapt tags: trunk
Changes

Changes to stage.patch.

502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
...
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
 .else
 	@${DO_NADA}
 .endif
@@ -5780,6 +5881,8 @@
 .if !defined(WITH_PKGNG)
 	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec [ $$(info -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*') -eq 1 ] && rm -f %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
 	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
@@ -5814,19 +5917,19 @@
 install-rc-script:
 .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
................................................................................
+.if !target(add-plist-info)
+add-plist-info:
+.for i in ${INFO}
+.if !defined(WITH_PKGNG)
+	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec [ $$(info -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*') -eq 1 ] && rm -f %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
+	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
+.else
+	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}
+.endif







|







 







|







502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
...
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
 .else
 	@${DO_NADA}
 .endif
@@ -5780,6 +5881,8 @@
 .if !defined(WITH_PKGNG)
 	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec [ \`info -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
+		>> ${TMPPLIST}
 	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
@@ -5814,19 +5917,19 @@
 install-rc-script:
 .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
................................................................................
+.if !target(add-plist-info)
+add-plist-info:
+.for i in ${INFO}
+.if !defined(WITH_PKGNG)
+	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec [ \`info -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
+		>> ${TMPPLIST}
+	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+		>> ${TMPPLIST}
+.else
+	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}
+.endif