Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2308/src/modules/atoms
Modified Files:
Makefile.ag
Log Message:
Changed the name of the generated tar balls (and the name of the
top-level directory within them).
The names are now equal to what nightly testing created, so that
doesn't have to rename the tar balls anymore.
The files are still installed in the same place as before.
Building RPMs still works.
The main change in the code is that we no longer use @PACKAGE@ since
that is the longer tar ball name which we don't want in the
installation directories we create. Also, we can't use the defaults
when installing include files since they would also otherwise be
installed in a directory with @PACKAGE@ in it.
Note, this will undoubtedly negatively affect the monetdb-install
script, but I leave it to its owner to fix that.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/Makefile.ag,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.ag 12 Sep 2007 10:55:22 -0000 1.35
+++ Makefile.ag 3 Dec 2007 08:24:47 -0000 1.36
@@ -19,11 +19,10 @@
MTSAFE
LIBS = {
- DIR = pkglibdir
+ DIR = libdir/MonetDB5
SEP = _
SOURCES = blob.mx url.mx mtime.mx streams.mx inet.mx color.mx xml.mx
- HEADERS = h
#SCRIPTS = mal
LIBS = $(MONETDB_LIBS) -lbat -lstream $(MATH_LIBS) \
$(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \
@@ -31,11 +30,10 @@
}
lib__str = {
- DIR = pkglibdir
+ DIR = libdir/MonetDB5
SEP = _
SOURCES = str.mx
- HEADERS = h
#SCRIPTS = mal
LIBS = $(MONETDB_LIBS) -lbat -lstream \
$(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \
@@ -43,10 +41,17 @@
$(ICONV_LIBS) ../../mal/libmal
}
+headers_h = {
+ DIR = includedir/MonetDB5/atoms
+ SOURCES = blob.mx url.mx mtime.mx streams.mx inet.mx color.mx xml.mx \
+ str.mx
+ HEADERS = h
+}
+
headers_mal = {
HEADERS = mal
- DIR = pkglibdir
+ DIR = libdir/MonetDB5
SOURCES = str.mx blob.mx url.mx mtime.mx streams.mx inet.mx color.mx
xml.mx
}
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
