diff buildsys.mk.in @ 2974:d116c0d61dd2

follow core changes.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 26 Nov 2008 05:17:55 +0900
parents c79e239a816f
children a68a51138f4d
line wrap: on
line diff
--- a/buildsys.mk.in	Wed Nov 26 03:13:39 2008 +0900
+++ b/buildsys.mk.in	Wed Nov 26 05:17:55 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@
@@ -81,7 +81,8 @@
 OBJS += ${OBJS7:.xpm=.o}
 
 .SILENT:
-.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .py .pyc .xpm
+.SUFFIXES:
+.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm
 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
 
 all:
@@ -122,8 +123,8 @@
 	done; \
 	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
 		${DEPEND_STATUS}; \
-		rm -f .deps; \
 		if ${MAKE} ${MFLAGS} $$deps; then \
+			rm -f .deps; \
 			cat $$deps >.deps; \
 			rm -f $$deps; \
 			${DEPEND_OK}; \
@@ -397,7 +398,7 @@
 		${MAKE} ${MFLAGS} clean || exit 1; \
 		${DIR_LEAVE}; \
 	done
-	
+
 	for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps ${DEPS}; do \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
@@ -414,7 +415,7 @@
 		${MAKE} ${MFLAGS} distclean || exit 1; \
 		${DIR_LEAVE}; \
 	done
-	
+
 	for i in ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN} *~; do \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \