[csw-devel] SF.net SVN: gar:[16533] csw/mgar/pkg/unixodbc/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 16533
          http://gar.svn.sourceforge.net/gar/?rev=16533&view=rev
Author:   dmichelsen
Date:     2011-12-16 12:39:50 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
unixodbc/trunk: Minor fixups

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

Modified: csw/mgar/pkg/unixodbc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unixodbc/trunk/Makefile	2011-12-15 22:42:51 UTC (rev 16532)
+++ csw/mgar/pkg/unixodbc/trunk/Makefile	2011-12-16 12:39:50 UTC (rev 16533)
@@ -17,7 +17,8 @@
 
 PACKAGES += CSWunixodbc
 SPKG_DESC_CSWunixodbc = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWunixodbc += CSWiconv
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1
@@ -34,25 +35,23 @@
 
 PACKAGES += CSWlibodbc1
 SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1
-PKGFILES_CSWlibodbc1 = $(call pkgfiles_lib,libodbc.so.1)
+PKGFILES_CSWlibodbc1 += $(call pkgfiles_lib,libodbc.so.1)
+PKGFILES_CSWlibodbc1 += $(sysconfdir)/.*
 RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibiconv2
 
 PACKAGES += CSWlibodbccr1
 SPKG_DESC_CSWlibodbccr1 = $(DESCRIPTION), libodbccr.so.1
-PKGFILES_CSWlibodbccr1 = $(call pkgfiles_lib,libodbccr.so.1)
+PKGFILES_CSWlibodbccr1 += $(call pkgfiles_lib,libodbccr.so.1)
 
 PACKAGES += CSWlibodbcinst1
 SPKG_DESC_CSWlibodbcinst1 = $(DESCRIPTION), libodbcinst.so.1
-PKGFILES_CSWlibodbcinst1 = $(call pkgfiles_lib,libodbcinst.so.1)
+PKGFILES_CSWlibodbcinst1 += $(call pkgfiles_lib,libodbcinst.so.1)
 RUNTIME_DEP_PKGS_CSWlibodbcinst1 += CSWlibltdl7
 
 BUILD64 = 1
 CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --enable-gui=no
 
-# TEST_SCRIPTS =
-
 PRESERVECONF += $(sysconfdir)/odbc.ini
 PRESERVECONF += $(sysconfdir)/odbcinst.ini
 

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