Index: src/Clients/Classical/Makefile.am =================================================================== --- src/Clients/Classical/Makefile.am.orig +++ src/Clients/Classical/Makefile.am @@ -41,7 +41,7 @@ RESOURCES = \ -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png \ -resource:$(top_srcdir)/data/app-graphics/gbrainy.svg -gbrainydir = $(libdir)/gbrainy +gbrainydir = $(pkglibexecdir) gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config bin_SCRIPTS = gbrainy Index: src/Clients/Classical/gbrainy.in =================================================================== --- src/Clients/Classical/gbrainy.in.orig +++ src/Clients/Classical/gbrainy.in @@ -1,10 +1,8 @@ #!/bin/bash -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ +pkglibexecdir=@libexecdir@ -MONO_EXE="$libdir/gbrainy/gbrainy.exe" +MONO_EXE="$pkglibexecdir/gbrainy.exe" for arg in $*; do case "x--debug" in ("x${arg}") Index: src/Core/Makefile.am =================================================================== --- src/Core/Makefile.am.orig +++ src/Core/Makefile.am @@ -69,19 +69,19 @@ $(TARGET): $(CSFILES) $(RES) $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ < $< > $@ all: $(TARGET) $(TARGET_CFG) install-data-local: $(TARGET) $(TARGET_CFG) - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) uninstall-local: - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config EXTRA_DIST = \ $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in Index: src/Core/Makefile.in =================================================================== --- src/Core/Makefile.in.orig +++ src/Core/Makefile.in @@ -472,19 +472,19 @@ $(TARGET): $(CSFILES) $(RES) $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ < $< > $@ all: $(TARGET) $(TARGET_CFG) install-data-local: $(TARGET) $(TARGET_CFG) - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) uninstall-local: - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/Games/Makefile.am =================================================================== --- src/Games/Makefile.am.orig +++ src/Games/Makefile.am @@ -92,11 +92,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) uninstall-local: - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll EXTRA_DIST = \ $(CSDISTFILES) $(RES) Index: src/Games/Makefile.in =================================================================== --- src/Games/Makefile.in.orig +++ src/Games/Makefile.in @@ -495,11 +495,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) uninstall-local: - cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/Clients/Classical/Makefile.in =================================================================== --- src/Clients/Classical/Makefile.in.orig +++ src/Clients/Classical/Makefile.in @@ -274,7 +274,7 @@ RESOURCES = \ -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png \ -resource:$(top_srcdir)/data/app-graphics/gbrainy.svg -gbrainydir = $(libdir)/gbrainy +gbrainydir = $(pkglibexecdir) gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config bin_SCRIPTS = gbrainy GBRAINY_CSFILES = $(GBRAINY_CSDISTFILES) \