Partially revert 004bf2fb49e3.

This commit is contained in:
Jonathan Schleifer 2007-11-08 16:08:17 +01:00
parent 1226f99f92
commit dec011f290

View file

@ -201,29 +201,32 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
i=${LIB}; \ for i in ${LIB}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \ if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi fi \
done
i=${STATIC_LIB}; \ for i in ${STATIC_LIB}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi fi \
done
i=${PLUGIN}; \ for i in ${PLUGIN}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi fi \
done
for i in ${DATA}; do \ for i in ${DATA}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -234,13 +237,14 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
fi \ fi \
done done
i=${PROG}; \ for i in ${PROG}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi fi \
done
for i in ${INCLUDES}; do \ for i in ${INCLUDES}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -269,32 +273,35 @@ uninstall: uninstall-extra
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
i=${LIB}; \ for i in ${LIB}; do \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if ${UNINSTALL_LIB}; then \ if ${UNINSTALL_LIB}; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi fi; \
done
i=${STATIC_LIB}; \ for i in ${STATIC_LIB}; do \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if rm -f ${DESTDIR}${libdir}/$$i; then \ if rm -f ${DESTDIR}${libdir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi fi \
done
i=${PLUGIN}; \ for i in ${PLUGIN}; do \
if test -f ${DESTDIR}${plugindir}/$$i; then \ if test -f ${DESTDIR}${plugindir}/$$i; then \
if rm -f ${DESTDIR}${plugindir}/$$i; then \ if rm -f ${DESTDIR}${plugindir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi fi \
done
-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
for i in ${DATA}; do \ for i in ${DATA}; do \
@ -307,14 +314,15 @@ uninstall: uninstall-extra
fi \ fi \
done done
i=${PROG}; \ for i in ${PROG}; do \
if test -f ${DESTDIR}${bindir}/$$i; then \ if test -f ${DESTDIR}${bindir}/$$i; then \
if rm -f ${DESTDIR}${bindir}/$$i; then \ if rm -f ${DESTDIR}${bindir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi fi \
done
for i in ${INCLUDES}; do \ for i in ${INCLUDES}; do \
if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \