diff buildsys.mk.in @ 2006:a56a26a5f233

Revised the plugindir logic.
author Eugene Paskevich <eugene@raptor.kiev.ua>
date Wed, 10 Oct 2007 01:40:13 +0300
parents 422b20698db5
children 31cf04fc588b
line wrap: on
line diff
--- a/buildsys.mk.in	Tue Oct 09 22:39:32 2007 +0300
+++ b/buildsys.mk.in	Wed Oct 10 01:40:13 2007 +0300
@@ -58,7 +58,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-plugindir ?= ${PACKAGE}
+plugindir = @plugindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@
@@ -220,7 +220,7 @@
 
 	for i in ${PLUGIN}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir}/${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -293,15 +293,15 @@
 	done
 
 	for i in ${PLUGIN}; do \
-		if test -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
-			if rm -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+		if test -f ${DESTDIR}${plugindir}/$$i; then \
+			if rm -f ${DESTDIR}${plugindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
-	-rmdir ${DESTDIR}${libdir}/${plugindir} >/dev/null 2>&1
+	-rmdir ${plugindir} >/dev/null 2>&1
 
 	for i in ${DATA}; do \
 		if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \