[Gtk2hs-commit] gtk2hs ChangeLog,1.239,1.240 Makefile.am,1.12,1.13

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Understand my intention, revert the last commit and fix the real error.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	1 Dec 2004 10:12:35 -0000	1.12
+++ Makefile.am	1 Dec 2004 13:19:28 -0000	1.13
@@ -175,7 +175,7 @@
 libgtk2hs_a_NAME = libgtk2hs.a
 $(libgtk2hs_a_NAME) : NAME = libgtk2hs_a
 
-libgtk2hs_a_PACKAGE		= gtk2hs
+libgtk2hs_a_PACKAGE		= gtk/gtk2hs.pkg
 libgtk2hs_a_PACKAGEDEPS		= data
 libgtk2hs_a_HEADER 		= gtk/gtk.h
 libgtk2hs_a_PRECOMP		= gtk/gtk.precomp

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- ChangeLog	1 Dec 2004 10:12:35 -0000	1.239
+++ ChangeLog	1 Dec 2004 13:19:28 -0000	1.240
@@ -1,11 +1,10 @@
 2004-12-01 Axel Simon <A....@ke...> 
 
-	* Makefile.am: Renamed the package back to gtk2hs.
-
 	* gtk/menuComboToolbar/Toolbar.chs.pp: Removed two slashes that
 	confused haddock.
 
-	* mk/common.mk: Removed a bogus variable during linking.
+	* mk/common.mk: Build the package with the correct name, not the
+	name of the package file. Removed a bogus variable during linking.
 	
 2004-11-28 Axel Simon <A....@ke...>