[patch] elektra-0.5.0.4.patch

elektra-0.5.0.4.patch (text/plain), 5.05 KB, created by Tim Cera on 2005-08-24 15:57:17 UTC

diff -ur elektra-0.5.0.4/Makefile elektra-0.5.0.4.new/Makefile
--- elektra-0.5.0.4/Makefile	2005-06-05 13:32:31.000000000 -0400
+++ elektra-0.5.0.4.new/Makefile	2005-08-24 06:32:11.000000000 -0400
@@ -26,10 +26,8 @@
 SGMLDIR=$(UDIR)/share/sgml
 
 
-DIRS=src xmldtd xmlschema doc
-
-
-
+DIRS=src xmldtd xmlschema 
+DOC_DIR=doc
 
 
 all: elektra.pc
@@ -44,6 +42,17 @@
 	done
 
 
+doc: elektra.pc
+	for x in ${DOC_DIR}; do (cd "$$x"; $(MAKE) \
+		BACKENDS=${BACKENDS} \
+		OPTIMIZATIONS="${OPTIMIZATIONS}" \
+		DTDVERSION=${DTDVERSION} \
+		DOCDIR=${DOCDIR} MANDIR=${MANDIR} SGMLDIR=${SGMLDIR} \
+		BINDIR=${BINDIR} LIBDIR=${LIBDIR} \
+		UBINDIR=${UBINDIR} ULIBDIR=${ULIBDIR} \
+		CONFDIR=${CONFDIR} INCDIR=${INCDIR} $@); \
+	done
+
 cleanhere:
 	-rm -f *~ elektra.spec elektra.pc svn-commit*
 	-find . -name "*~" -o -name ".kdbg*" | xargs rm -f
@@ -133,4 +142,4 @@
 	cp ChangeLog ${DESTDIR}${DOCDIR}/${NAME}
 	cp example/*-convert example/*.xml ${DESTDIR}${DOCDIR}/${NAME}
 	cp example/*.c ${DESTDIR}${DOCDIR}/${NAME}-devel/examples/
-	-LD_LIBRARY_PATH='${DESTDIR}${LIBDIR}':"$$LD_LIBRARY_PATH" [ `id -u` -eq "0" ] && kdb set system/sw/kdb/current/schemapath '${DESTDIR}${SGMLDIR}/elektra-${DTDVERSION}/elektra.xsd'
+#	-LD_LIBRARY_PATH='${DESTDIR}${LIBDIR}':"$$LD_LIBRARY_PATH" [ `id -u` -eq "0" ] && kdb set system/sw/kdb/current/schemapath '${DESTDIR}${SGMLDIR}/elektra-${DTDVERSION}/elektra.xsd'
diff -ur elektra-0.5.0.4/src/backends/berkeleydb/Makefile elektra-0.5.0.4.new/src/backends/berkeleydb/Makefile
--- elektra-0.5.0.4/src/backends/berkeleydb/Makefile	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/berkeleydb/Makefile	2005-08-23 06:46:46.000000000 -0400
@@ -27,7 +27,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} -shared -fpic -L../.. -lkdb -ldb -o $@ $<
+	${CC} -shared -fpic -L../.. -lelektra -ldb -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/backends/filesys/Makefile elektra-0.5.0.4.new/src/backends/filesys/Makefile
--- elektra-0.5.0.4/src/backends/filesys/Makefile	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/filesys/Makefile	2005-08-23 16:18:08.000000000 -0400
@@ -26,7 +26,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} -shared -fpic -lkdb -L../../ -o $@ $<
+	${CC} -shared -fpic -L../../ -lelektra -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/backends/fstab/Makefile elektra-0.5.0.4.new/src/backends/fstab/Makefile
--- elektra-0.5.0.4/src/backends/fstab/Makefile	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/fstab/Makefile	2005-08-23 06:47:35.000000000 -0400
@@ -27,7 +27,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} -shared -fpic -L../.. -lkdb -o $@ $<
+	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/backends/gconf/Makefile elektra-0.5.0.4.new/src/backends/gconf/Makefile
--- elektra-0.5.0.4/src/backends/gconf/Makefile	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/gconf/Makefile	2005-08-23 06:48:28.000000000 -0400
@@ -27,7 +27,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} `pkg-config --libs gconf-2.0` -shared -fpic -L../.. -lkdb -o $@ $<
+	${CC} `pkg-config --libs gconf-2.0` -shared -fpic -L../.. -lelektra -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/backends/ini/Makefile elektra-0.5.0.4.new/src/backends/ini/Makefile
--- elektra-0.5.0.4/src/backends/ini/Makefile	2005-07-24 18:37:01.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/ini/Makefile	2005-08-23 06:48:46.000000000 -0400
@@ -27,7 +27,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} -shared -fpic -L../.. -lkdb -o $@ $<
+	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/backends/template/Makefile elektra-0.5.0.4.new/src/backends/template/Makefile
--- elektra-0.5.0.4/src/backends/template/Makefile	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/backends/template/Makefile	2005-08-23 06:49:05.000000000 -0400
@@ -27,7 +27,7 @@
 
 
 ${LIBNAME}-${BACKENDNAME}.so: ${SOURCES:.c=.o}
-	${CC} -shared -fpic -L../.. -lkdb -o $@ $<
+	${CC} -shared -fpic -L../.. -lelektra -o $@ $<
 
 
 
diff -ur elektra-0.5.0.4/src/kdb.c elektra-0.5.0.4.new/src/kdb.c
--- elektra-0.5.0.4/src/kdb.c	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/kdb.c	2005-08-23 16:35:07.000000000 -0400
@@ -1209,7 +1209,7 @@
 int loadToolsLib(void) {
 	void *dlhandle=0;
 	
-	dlhandle=dlopen("libkdbtools.so",RTLD_LAZY);
+	dlhandle=dlopen("libelektratools.so",RTLD_LAZY);
 	if (dlhandle == 0) {
 		fprintf(stderr, "kdb: %s\n",dlerror());
 		return 1;
diff -ur elektra-0.5.0.4/src/libkdb.c elektra-0.5.0.4.new/src/libkdb.c
--- elektra-0.5.0.4/src/libkdb.c	2005-07-25 09:00:44.000000000 -0400
+++ elektra-0.5.0.4.new/src/libkdb.c	2005-08-23 16:42:17.000000000 -0400
@@ -231,7 +231,7 @@
 	/* load the environment and make us aware of codeset conversions */
 	setlocale(LC_ALL,"");
 	
-	sprintf(backendlib,"libkdb-%s.so",backendName);
+	sprintf(backendlib,"libelektra-%s.so",backendName);
 	dlhandle=dlopen(backendlib,RTLD_LAZY);
 	if (dlhandle == 0) {
 		fprintf(stderr, "libkdb: Could not open \"%s\" backend: %s\n",