[Gtk2hs-commit] gtk2hs/mk chsDepend.in,1.10,1.11 common.mk,1.49,1.50

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123/mk

Modified Files:
	chsDepend.in common.mk 
Log Message:
Move a couple Types.chs locations/names and make sure the empty directories
get included in the tarball.
Make sure Types and Signals files are removed on make clean.
Disable building and distributing the apicoverage tool.

In mk/common.mk, make package registering on install work again after the
earlier change to using pkglibdir.

in mk/chsDepend.in, do the extra check properly and make it a warning by
default. It still warns rather a lot.


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- chsDepend.in	13 Jan 2005 23:09:20 -0000	1.10
+++ chsDepend.in	14 Jan 2005 19:04:50 -0000	1.11
@@ -29,17 +29,21 @@
     DEPNAMES=;
     for DEP in $DEPS; do
       IFS=:;
+      FOUND=no;
       for DEPDIR in $SEARCHPATH; do
         DEPNAME=`echo "$DEPDIR/$DEP" | $SED 's%\.//*%%'`;
         #echo Looking for $DEP in $DEPDIR , i.e.: $DEPNAME
         if test -f "$DEPNAME.chs"; then
           #echo Found $DEP in $DEPDIR
 	  DEPNAMES="$DEPNAMES $DEPNAME.chi";
+	  FOUND=yes;
 	  break;
         fi;
-#	echo could not find $DEP '('$DEPNAME.chs')' on search path $SEARCHPATH;
-#	exit 1;
       done;
+      if test $FOUND = no; then
+        echo could not find $DEP.chs on search path $SEARCHPATH;
+#        exit 1;
+      fi;
       IFS=$OLDIFS;
     done;
     echo "# .chs dependencies for $FULLNAME" > $FULLNAMEDEP;

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- common.mk	13 Jan 2005 23:01:17 -0000	1.49
+++ common.mk	14 Jan 2005 19:04:50 -0000	1.50
@@ -112,9 +112,9 @@
 install-data-hook :
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
-	$(foreach pkgname,$(lib_LIBRARIES), \
+	$(foreach pkgname,$(pkglib_LIBRARIES), \
 	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
-	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \
+	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) -Dpkglibdir=$(pkglibdir)\
 	-i $(call getVar,$(pkgname),PACKAGE);)
 
 uninstall-hook :