[csw-devel] SF.net SVN: gar:[3489] csw/mgar/pkg/python/trunk

[valholla at users.sourceforge.net]

Revision: 3489
          http://gar.svn.sourceforge.net/gar/?rev=3489&view=rev
Author:   valholla
Date:     2009-02-25 19:04:14 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
regular expression fix for dynamic prototype

Modified Paths:
--------------
    csw/mgar/pkg/python/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0

Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile	2009-02-25 18:25:17 UTC (rev 3488)
+++ csw/mgar/pkg/python/trunk/Makefile	2009-02-25 19:04:14 UTC (rev 3489)
@@ -51,10 +51,10 @@
 CONFIGURE_ARGS += --enable-unicode=ucs4
 CONFIGURE_ARGS += --with-fpectl
 
-PKGFILES_CSWidle = $(libdir)/python2*/idlelib/.*
+PKGFILES_CSWidle  = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.*
 PKGFILES_CSWidle += $(bindir)/idle
-PKGFILES_CSWpython-tk = $(libdir)/python2*/lib-tk/.*
-PKGFILES_CSWpython-tk += $(libdir)/python2*/lib-dynload/*tkinter*
+PKGFILES_CSWpython-tk  = $(libdir)/python(\d+(?:\.\d+)*)/lib-tk/.*
+PKGFILES_CSWpython-tk += $(libdir)/python(\d+(?:\.\d+)*)/lib-dynload/*tkinter*
 
 REQUIRED_PKGS_CSWpython  = CSWbdb44 CSWbzip2 CSWgdbm CSWggettextrt 
 REQUIRED_PKGS_CSWpython += CSWncurses CSWosslrt CSWreadline CSWzlib
@@ -72,12 +72,20 @@
 
 include gar/category.mk
 
-post-install-modulated: add-depricated-libs
+POST_INST_SCR  = add-depricated-libs
+POST_INST_SCR += fix-config-makefile
+post-install-modulated: $(POST_INST_SCR)
 
 add-depricated-libs:
 	echo "===> Adding Depricated Libs"
-	cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) $(DESTDIR)$(libdir)/libpython2.5.so.1.0
+	cp $(DOWNLOADDIR)/libpython2.5.so.1.0-$(MODULATION) \
+		$(DESTDIR)$(libdir)/libpython2.5.so.1.0
 	cd $(DESTDIR)$(libdir);ln -s libpython2.5.so.1.0 libpython2.5.so
 	$(DONADA)
 
+fix-config-makefile:
+	perl -i -plne 's/^CCSHARED=.*/CCSHARED=/' \
+		$(DESTDIR)$(libdir)/python/config/Makefile
+	$(MAKECOOKIE)
 
+

Deleted: csw/mgar/pkg/python/trunk/files/libpython2.5.so.1.0
===================================================================
(Binary files differ)


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