From 2fde009ae1b947b685b1c883592e8ec8045e4274 Mon Sep 17 00:00:00 2001 From: stpohle Date: Mon, 28 Jul 2003 23:57:28 +0000 Subject: [PATCH] Makefiles Changes again for debian packages --- configure.in | 2 +- data/Makefile.am | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 72fcebd..94b7fdc 100644 --- a/configure.in +++ b/configure.in @@ -87,7 +87,7 @@ else fi dnl Set PACKAGE DATA & DOC DIR -packagedatadir=share/${PACKAGE} +packagedatadir=share/games/${PACKAGE} packagedocdir=share/doc/${PACKAGE} dnl Set PACKAGE DIRS in config.h. diff --git a/data/Makefile.am b/data/Makefile.am index e5c62c6..4c42c4f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,13 +17,13 @@ install: echo ""; \ exit 1; \ fi; - @if test ! -d ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@; then \ - mkdir ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@; \ + @if test ! -d ${DESTDIR}@PACKAGE_DATA_DIR@; then \ + mkdir ${DESTDIR}@PACKAGE_DATA_DIR@; \ fi; - cp player ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf - cp maps ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf - cp gfx ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf - cp tileset ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ -rf + cp player ${DESTDIR}@PACKAGE_DATA_DIR@ -rf + cp maps ${DESTDIR}@PACKAGE_DATA_DIR@ -rf + cp gfx ${DESTDIR}@PACKAGE_DATA_DIR@ -rf + cp tileset ${DESTDIR}@PACKAGE_DATA_DIR@ -rf uninstall: - rm -rf ${prefix}/@NO_PREFIX_PACKAGE_DATA_DIR@ + rm -rf ${DESTDIR}@PACKAGE_DATA_DIR@