[csw-devel] SF.net SVN: gar:[18500] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 18500
          http://gar.svn.sourceforge.net/gar/?rev=18500&view=rev
Author:   dmichelsen
Date:     2012-06-22 10:40:36 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Fixed issue with wrong pathes for 64 bit

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2012-06-22 10:08:39 UTC (rev 18499)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2012-06-22 10:40:36 UTC (rev 18500)
@@ -190,11 +190,11 @@
 CMAKE_ARGS += -DINSTALL_LAYOUT=RPM
 CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)
 CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir)
-CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir_install))
-CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir_install))
+CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir))
+CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir))
 # CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir))
-CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir_install))
-CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir_install))/$(NAME)/$(MM_LIBDIR)/plugin
+CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir))
+CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin
 CMAKE_ARGS += -DWITH_READLINE=1
 CMAKE_ARGS += -DWITH_LIBWRAP=1
 CMAKE_ARGS += -DWITH_SSL=system
@@ -209,8 +209,8 @@
 # CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 # CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix)
-# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libssl.so
-# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so
+# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so
+# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
 CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"

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