diff buildsys.mk.in @ 4814:06fb50c7f40a

we should use modified libdir insted of plugindir.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 26 Nov 2008 05:15:41 +0900
parents 9bc0c8a3a0f0
children 651f5da89c3f
line wrap: on
line diff
--- a/buildsys.mk.in	Wed Nov 26 03:50:00 2008 +0900
+++ b/buildsys.mk.in	Wed Nov 26 05:15:41 2008 +0900
@@ -62,8 +62,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-libdir = @libdir@
-plugindir ?= ${libdir}/${PACKAGE}
+libdir = @libdir@/${PACKAGE}
+plugindir ?= ${libdir}
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@
@@ -248,7 +248,7 @@
 
 	for i in ${LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL_LIB}; then \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -257,7 +257,7 @@
 
 	for i in ${STATIC_LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${plugindir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -319,7 +319,7 @@
 	done
 
 	for i in ${LIB}; do \
-		if test -f ${DESTDIR}${plugindir}/$$i; then \
+		if test -f ${DESTDIR}${libdir}/$$i; then \
 			if ${UNINSTALL_LIB}; then \
 				${DELETE_OK}; \
 			else \
@@ -329,8 +329,8 @@
 	done
 
 	for i in ${STATIC_LIB}; do \
-		if test -f ${DESTDIR}${plugindir}/$$i; then \
-			if rm -f ${DESTDIR}${plugindir}/$$i; then \
+		if test -f ${DESTDIR}${libdir}/$$i; then \
+			if rm -f ${DESTDIR}${libdir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \