From d89ce4b8fafa0e06bd5390aa12ea80e1fc8ab3db Mon Sep 17 00:00:00 2001 From: begasus Date: Fri, 26 Jul 2019 08:40:53 +0200 Subject: Import previous patch diff --git a/Makefile.am b/Makefile.am index 2fd2517..47a324c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,2 @@ SUBDIRS = src Tgfx data fonts music sounds docs +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 756db76..b6b101f 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_INIT(src/faes.cpp, 0.1, T-1000@Bigfoot.com) AM_INIT_AUTOMAKE(pachi, 0.1) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER(config.h) # Checks for programs. AC_PROG_CC @@ -44,7 +44,7 @@ if test "$enable_devel" = "yes"; then SCOREDIR="." else DATADIR="$datadir/$PACKAGE" - SCOREDIR="/var/lib/games/$PACKAGE" + SCOREDIR="$localstatedir/$PACKAGE" fi eval DATAPATH=`eval echo "$DATADIR"` @@ -55,3 +55,4 @@ AC_SUBST(DATAPATH) AC_SUBST(SCOREPATH) AC_OUTPUT(Makefile src/Makefile Tgfx/Makefile data/Makefile fonts/Makefile music/Makefile sounds/Makefile docs/Makefile) +AC_CONFIG_MACRO_DIR([m4]) diff --git a/data/Makefile.am b/data/Makefile.am index a61da49..0b60b90 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,9 +14,3 @@ score_DATA = \ scores.dat EXTRA_DIST = $(dat_DATA) $(score_DATA) - -install-data-local: - for file in $(score_DATA); do\ - chgrp $(group) $(scoredir)/$$file; \ - chmod $(perms) $(scoredir)/$$file; \ - done -- 2.21.0