Changeset: 22b180729cdb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22b180729cdb
Modified Files:
MonetDB.spec
buildtools/autogen/autogen/am.py
debian/libmonetdb5-server-geom11.install
debian/monetdb5-server.install
debian/monetdb5-sql.install
monetdb5/mal/mal_linker.mx
Branch: default
Log Message:
Get rid of .../lib*/monetdb5/lib directory, move libs one level up.
On Windows, we already didn't use this lib subdirectory, and there is
no need to use it on other platforms.
diffs (164 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -322,7 +322,7 @@
%{_libdir}/monetdb5/autoload/*_geom.mal
%{_libdir}/monetdb5/createdb/*_geom.sql
%{_libdir}/monetdb5/geom.mal
-%{_libdir}/monetdb5/lib/lib_geom.so*
+%{_libdir}/monetdb5/lib_geom.so*
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
@@ -372,7 +372,6 @@
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
-%dir %{_libdir}/monetdb5/lib
%exclude %{_libdir}/monetdb5/geom.mal
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
@@ -381,10 +380,10 @@
%{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
%{_libdir}/monetdb5/autoload/*_xml.mal
-%exclude %{_libdir}/monetdb5/lib/lib_geom.*
-# %exclude %{_libdir}/monetdb5/lib/lib_rdf.*
-%exclude %{_libdir}/monetdb5/lib/lib_sql.*
-%{_libdir}/monetdb5/lib/*.so*
+%exclude %{_libdir}/monetdb5/lib_geom.*
+# %exclude %{_libdir}/monetdb5/lib_rdf.*
+%exclude %{_libdir}/monetdb5/lib_sql.*
+%{_libdir}/monetdb5/*.so*
%doc %{_mandir}/man5/monetdb5.conf.5.gz
# %package -n MonetDB5-server-rdf
@@ -403,7 +402,7 @@
# %files -n MonetDB5-server-rdf
# %defattr(-,root,root)
# %{_libdir}/monetdb5/autoload/*_rdf.mal
-# %{_libdir}/monetdb5/lib/lib_rdf.so*
+# %{_libdir}/monetdb5/lib_rdf.so*
# %{_libdir}/monetdb5/rdf.mal
# %{_libdir}/monetdb5/createdb/*_rdf.sql
@@ -430,7 +429,7 @@
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
%{_libdir}/monetdb5/autoload/*_sql.mal
-%{_libdir}/monetdb5/lib/lib_sql.so*
+%{_libdir}/monetdb5/lib_sql.so*
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
@@ -550,7 +549,7 @@
# remove unwanted stuff
# .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/lib/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
# internal development stuff
rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -790,9 +790,6 @@
scripts_ext = libmap['SCRIPTS']
ld = am_translate_dir(ld, am)
- if sep == '_' and pref:
- # if no prefix, also don't put in subdirectory
- ld = ld + '/lib'
fd.write("%sdir = %s\n" % (libname, ld))
if libmap.has_key('NOINST'):
am['NLIBS'].append((pref, libname, sep))
@@ -880,9 +877,6 @@
if libsmap.has_key('SEP'):
sep = libsmap['SEP'][0]
- if sep == '_':
- ld = ld + '/lib'
-
scripts_ext = []
if libsmap.has_key('SCRIPTS'):
scripts_ext = libsmap['SCRIPTS']
@@ -952,7 +946,7 @@
fd.write("%sdir = %s\n" % (libname, ld))
fd.write("lib%s%s_la_CFLAGS=-DLIB%s $(AM_CFLAGS)\n" %
(sep,libname,libname.upper()))
am['LIBS'].append(('lib', libname, sep, ''))
- am['InstallList'].append("\t"+ld+"/lib"+sep+libname+".so\n")
+ am['InstallList'].append("\t"+ld+sep+libname+".so\n")
if libsmap.has_key('HEADERS'):
HDRS = []
diff --git a/debian/libmonetdb5-server-geom11.install
b/debian/libmonetdb5-server-geom11.install
--- a/debian/libmonetdb5-server-geom11.install
+++ b/debian/libmonetdb5-server-geom11.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/monetdb5/autoload/*_geom.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/createdb/*_geom.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/geom.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib/lib_geom.so* usr/lib/monetdb5/lib
+debian/tmp/usr/lib/monetdb5/lib_geom.so* usr/lib/monetdb5
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -4,12 +4,12 @@
debian/tmp/usr/lib/monetdb5/autoload/05_xml.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/70_vault.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/72_fits.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/lib/lib_batxml.so* usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_crackers.so* usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_fits.so* usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_mal_compiler.so* usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_vault.so* usr/lib/monetdb5/lib
-debian/tmp/usr/lib/monetdb5/lib/lib_xml.so* usr/lib/monetdb5/lib
+debian/tmp/usr/lib/monetdb5/lib_batxml.so* usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_crackers.so* usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_fits.so* usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_mal_compiler.so* usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_vault.so* usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_xml.so* usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/aggr.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/alarm.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/algebra.mal usr/lib/monetdb5
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,7 +3,7 @@
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/*_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/sql*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib/lib_sql.so* usr/lib/monetdb5/lib
+debian/tmp/usr/lib/monetdb5/lib_sql.so* usr/lib/monetdb5
debian/tmp/usr/share/doc/MonetDB-SQL-* usr/share/doc
debian/tmp/usr/lib/monetdb5/createdb/10_math.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/11_times.sql usr/lib/monetdb5/createdb
diff --git a/monetdb5/mal/mal_linker.mx b/monetdb5/mal/mal_linker.mx
--- a/monetdb5/mal/mal_linker.mx
+++ b/monetdb5/mal/mal_linker.mx
@@ -408,19 +408,12 @@
binpath = dirname(binpath);
binpath = dirname(binpath);
for (i = 0; libdirs[i] != NULL; i++) {
- snprintf(prmodpath, sizeof(prmodpath),
"%s%c%s%cmonetdb5%clib",
- binpath, DIR_SEP, libdirs[i], DIR_SEP,
DIR_SEP);
+ snprintf(prmodpath, sizeof(prmodpath),
"%s%c%s%cmonetdb5",
+ binpath, DIR_SEP, libdirs[i], DIR_SEP);
if (stat(prmodpath, &sb) == 0) {
snprintf(prmodpath, sizeof(prmodpath),
- "%s%c%s%cmonetdb5:"
-#ifndef __MINGW32__
- "%s%c%s%cmonetdb5%clib"
-#else
- "%s%c%s%cmonetdb5%cbin"
-#endif
- ,
- binpath, DIR_SEP, libdirs[i],
DIR_SEP,
- binpath, DIR_SEP, libdirs[i],
DIR_SEP, DIR_SEP);
+ "%s%c%s%cmonetdb5",
+ binpath, DIR_SEP, libdirs[i], DIR_SEP);
mod_path = prmodpath;
break;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
