[Gtk2hs-commit] gtk2hs/mk common.mk,1.41,1.42

[Axel S. <as...@us...>]

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

Modified Files:
	common.mk 
Log Message:
Make installation work. mogul is broken since it's not in configure.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- common.mk	9 Dec 2004 18:45:01 -0000	1.41
+++ common.mk	12 Dec 2004 14:28:12 -0000	1.42
@@ -120,11 +120,10 @@
 
 uninstall-hook :
 	$(foreach pkgname,$(lib_LIBRARIES), \
-	if test -f $(PKGCONF); then \
 	  $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \
-	  -r $(patsubst lib%,%,$(basename $(notdir $(pkgname)))); \
-	  $(if $(PKGCONF),\
+	  -r `cat $(call getVar,$(pkgname),PACKAGE) | $(GREP) name | $(SED) "s/ *name *= *\"\([a-zA-Z0-9]*\)\",/\1/"`;) \
+	$(if $(PKGCONF),if test -f $(PKGCONF); then \
 	  if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \
-	  $(RM) $(PKGCONF) $(PKGCONF).old; fi;) \
-	fi;)
+	  $(RM) $(PKGCONF) $(PKGCONF).old; fi; \
+	fi)