js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use PACKAGE_NAME and PACKAGE_VERSION.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-03-21 12:44:40 +01:00
parent 5ba5720278
commit 6fb50c0f73
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
buildsys.mk.in
View file

@ -21,7 +21,8 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
@ -72,13 +73,13 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
libdir = @libdir@ libdir = @libdir@
plugindir ?= ${libdir}/${PACKAGE} plugindir ?= ${libdir}/${PACKAGE_NAME}
datarootdir = @datarootdir@ datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
includedir = @includedir@ includedir = @includedir@
includesubdir ?= ${PACKAGE} includesubdir ?= ${PACKAGE_NAME}
localedir = @localedir@ localedir = @localedir@
localename ?= ${PACKAGE} localename ?= ${PACKAGE_NAME}
mandir = @mandir@ mandir = @mandir@
mansubdir ?= man1 mansubdir ?= man1
@ -542,7 +543,7 @@ install: ${SHARED_LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install
for i in ${DATA}; do \ for i in ${DATA}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
@ -626,16 +627,16 @@ uninstall: uninstall-extra
-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
for i in ${DATA}; do \ for i in ${DATA}; do \
if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi; \ fi; \
rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i)" >/dev/null 2>&1 || true; \ rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" >/dev/null 2>&1 || true; \
done done
-rmdir ${DESTDIR}${datadir}/${PACKAGE} >/dev/null 2>&1 -rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1
for i in ${PROG}; do \ for i in ${PROG}; do \
if test -f ${DESTDIR}${bindir}/$$i; then \ if test -f ${DESTDIR}${bindir}/$$i; then \

4
configure.ac
View file

@ -43,10 +43,6 @@ BUILDSYS_INIT
dnl You need to call this to generate the .deps files required by the buildsys. dnl You need to call this to generate the .deps files required by the buildsys.
BUILDSYS_TOUCH_DEPS BUILDSYS_TOUCH_DEPS
dnl Set the name of your package here. It will be used in the default include
dnl paths for example. (Can be changed, see buildsys.mk.in for details.)
AC_SUBST(PACKAGE, name)
dnl If you don't need any extra variables dnl If you don't need any extra variables
AC_CONFIG_FILES(buildsys.mk) AC_CONFIG_FILES(buildsys.mk)
dnl If you need any extra variables, they go to extra.mk. dnl If you need any extra variables, they go to extra.mk.