[csw-devel] SF.net SVN: gar:[11118] csw/mgar/pkg/texinfo/trunk

[dmichelsen at users.sourceforge.net]

Revision: 11118
          http://gar.svn.sourceforge.net/gar/?rev=11118&view=rev
Author:   dmichelsen
Date:     2010-10-01 13:46:57 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
texinfo: Fix an issue when there are no info files installed at all

Modified Paths:
--------------
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall

Modified: csw/mgar/pkg/texinfo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texinfo/trunk/Makefile	2010-10-01 12:46:18 UTC (rev 11117)
+++ csw/mgar/pkg/texinfo/trunk/Makefile	2010-10-01 13:46:57 UTC (rev 11118)
@@ -34,6 +34,11 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
+# Are these really needed? May investigate deeply later.
+CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWgsed
+CHECKPKG_OVERRIDES_CSWtexinfo += surplus-dependency|CSWiconv
+
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall
===================================================================
--- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall	2010-10-01 12:46:18 UTC (rev 11117)
+++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall	2010-10-01 13:46:57 UTC (rev 11118)
@@ -9,10 +9,12 @@
    touch ${BASE}/share/info/dir 2>/dev/null; then
 
   echo "Registering existing texinfo-files..."
-  FILES=`ls ${BASE}/share/info/*.info ${BASE}/share/info/*.info-*`
-  for i in $FILES; do
-    ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null
-  done
+  FILES=${BASE}/share/info/*
+  if [ "${FILES}" != "${BASE}/share/info/*" ]; then
+    for i in $FILES; do
+      ${BASE}/bin/install-info $i ${BASE}/share/info/dir 2> /dev/null
+    done
+  fi
 else
   echo "Skip registering pages as ${BASE}/share/info/dir is not writable"
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.