File xclass-0.9.2-configs.patch of Package xclass

Overview Repositories Revisions Requests Users Attributes Meta

File xclass-0.9.2-configs.patch of Package xclass (Revision b5abb9772bc846e74d12c124bc7b7ff6)

Currently displaying revision b5abb9772bc846e74d12c124bc7b7ff6 , Show latest

--- xclass-0.9.2/Makefile.in
+++ xclass-0.9.2/Makefile.in
@@ -5,6 +5,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 subdirs=include lib config doc icons test example-app
+libdir=lib
 
 all:
 	@for i in ${subdirs}; do \
@@ -13,7 +14,7 @@
 	done
 
 shared:
-	@for i in ${subdirs}; do \
+	@for i in ${libdir}; do \
 		echo Making shared library in $$i ; \
 		(cd $$i; ${MAKE} shared) ; \
 	done
@@ -25,7 +26,7 @@
 	done
 
 install_shared:
-	@for i in ${subdirs}; do \
+	@for i in ${libdir}; do \
 		echo Installing in $$i ; \
 		(cd $$i; ${MAKE} install_shared) ; \
 	done
--- xclass-0.9.2/config/Makefile.in
+++ xclass-0.9.2/config/Makefile.in
@@ -14,7 +14,8 @@
 install_shared: install
 
 install:
-	${INSTALL} xc-config ${config_dir}
+	mkdir -p $(DESTDIR)${config_dir}
+	${INSTALL} xc-config $(DESTDIR)${config_dir}
 
 clean:
 	rm -f core *.bak *~
--- xclass-0.9.2/config/xc-config.in
+++ xclass-0.9.2/config/xc-config.in
@@ -7,8 +7,8 @@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
-lib_dir=@exec_prefix@/lib
-include_dir=@xclass_include@
+lib_dir=@libdir@
+include_dir=@prefix@/include
 
 usage()
 {
--- xclass-0.9.2/configure.in
+++ xclass-0.9.2/configure.in
@@ -43,7 +43,7 @@
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CXXFLAGS="$CXXFLAGS -g"
 else
-  test "$cflags_set" = set || CXXFLAGS="$CXXFLAGS -O2"
+  test "$cflags_set" = set || CXXFLAGS="$CXXFLAGS"
 fi
 
 
--- xclass-0.9.2/doc/Makefile.in
+++ xclass-0.9.2/doc/Makefile.in
@@ -3,8 +3,8 @@
 
 prefix=@prefix@
 lib_dir=@prefix@/lib
-doc_dir=@prefix@/xclass/docs
-etc_dir=@prefix@/xclass/etc
+doc_dir=@prefix@/share/doc/packages/xclass
+etc_dir=@sysconfdir@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -33,12 +33,12 @@
 install_shared: install
 
 install:
-	mkdir -p ${etc_dir}
-	${INSTALL_DATA} ${XCLASSRC} ${etc_dir}
-	${INSTALL_DATA} ${MIMETYPES} ${etc_dir}
-	mkdir -p ${doc_dir}
+	mkdir -p $(DESTDIR)${etc_dir}
+	${INSTALL_DATA} ${XCLASSRC} $(DESTDIR)${etc_dir}
+	#${INSTALL_DATA} ${MIMETYPES} $(DESTDIR)${etc_dir}
+	mkdir -p $(DESTDIR)${doc_dir}
 	for i in ${DOCS} ; do \
-		${INSTALL_DATA} ./$$i ${doc_dir} ; \
+		${INSTALL_DATA} ./$$i $(DESTDIR)${doc_dir} ; \
 	done
 
 clean:
--- xclass-0.9.2/doc/xclassrc
+++ xclass-0.9.2/doc/xclassrc
@@ -21,7 +21,7 @@
 
 ; Icon directory
 
-icon dir = /usr/local/xclass/icons
+icon dir = /usr/share/xclass/icons
 
 ; More settings to be added... :-)
 
--- xclass-0.9.2/icons/Makefile.in
+++ xclass-0.9.2/icons/Makefile.in
@@ -3,7 +3,7 @@
 
 prefix=@prefix@
 lib_dir=@prefix@/lib
-icon_dir=@prefix@/xclass/icons
+icon_dir=@prefix@/share/xclass/icons
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -334,10 +334,8 @@
 install_shared: install
 
 install:
-	mkdir -p ${icon_dir}
-	for i in ${ICONS} ; do \
-		${INSTALL_DATA} "./$$i" ${icon_dir} ; \
-	done
+	install -m 755 -d $(DESTDIR)${icon_dir}
+	install -m 644 *.xpm $(DESTDIR)${icon_dir}
 
 clean:
 	rm -f *~ core *.bak
--- xclass-0.9.2/include/xclass/Makefile.in
+++ xclass-0.9.2/include/xclass/Makefile.in
@@ -118,10 +118,10 @@
 install_shared: install
 
 install:
-	mkdir -p ${header_dir}
+	install -d -m 755 $(DESTDIR)${header_dir}
 	rm -f ${header_dir}/*.h
 	for i in ${HEADERS} ; do \
-		${INSTALL_DATA} ./$$i ${header_dir} ; \
+		${INSTALL_DATA} ./$$i $(DESTDIR)${header_dir} ; \
 	done
 
 distclean: clean
--- xclass-0.9.2/lib/libxclass/Makefile.in
+++ xclass-0.9.2/lib/libxclass/Makefile.in
@@ -6,7 +6,7 @@
 srcdir=@srcdir@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-lib_dir=@exec_prefix@/lib
+lib_dir=@libdir@
 x_includes=@x_includes@
 x_libraries=@x_libraries@
 
@@ -14,8 +14,8 @@
 
 CXX=@CXX@
 INCLUDES=-I${top_srcdir}/include ${x_includes}
-DEFINES=-DOX_DEFAULT_POOL=\"/usr/local/xclass-icons\" \
-	-DOX_DEFAULT_ROOT=\"/usr/local/xclass\"
+DEFINES=-DOX_DEFAULT_POOL=\"/usr/share/xclass/icons\" \
+	-DOX_DEFAULT_ROOT=\"/usr/share/xclass\"
 CXXFLAGS=${INCLUDES} ${DEFINES} @CXXFLAGS@
 EXTRALIBS=${x_libraries}
 RANLIB=@RANLIB@
@@ -130,8 +130,8 @@
 
 OBJS=$(SRCS:.cc=.o)
 
-all: ${STATIC_LIB}
-#all: ${STATIC_LIB} ${SHARED_LIB}
+#all: ${STATIC_LIB}
+all: ${STATIC_LIB} ${SHARED_LIB}
 
 both: ${STATIC_LIB} ${SHARED_LIB}
 
@@ -139,11 +139,15 @@
 shared: ${SHARED_LIB}
 
 install: ${STATIC_LIB}
-	${INSTALL_DATA} ${STATIC_LIB} ${lib_dir}
+	install -d -m 755 $(DESTDIR)${lib_dir}
+	${INSTALL_DATA} ${STATIC_LIB} $(DESTDIR)${lib_dir}
 
 install_shared: ${SHARED_LIB}
-	${INSTALL_DATA} ${SHARED_LIB} ${lib_dir}
-	ldconfig
+	install -d -m 755 $(DESTDIR)${lib_dir}
+	${INSTALL} ${SHARED_LIB} $(DESTDIR)${lib_dir}
+	cp -d lib$(lib_name).so.@XCLASS_MAJOR_VERSION@.@XCLASS_MINOR_VERSION@ $(DESTDIR)${lib_dir}
+	cp -d lib$(lib_name).so.@XCLASS_MAJOR_VERSION@ $(DESTDIR)${lib_dir}
+	cp -d lib$(lib_name).so $(DESTDIR)${lib_dir}
 
 clean:
 	rm -f ${OBJS} ${STATIC_LIB} ${SHARED_LIB} lib$(lib_name).so* *~ core *.bak

Places

File xclass-0.9.2-configs.patch of Package xclass (Revision b5abb9772bc846e74d12c124bc7b7ff6)

Places