From b85610fcdd1b7e2ff99dd6b00901cc70aba8f046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 30 May 2014 22:40:05 +0200
Subject: [PATCH] rename libexecdir to libdir

---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 46fc16214c..e26d837c75 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +48,9 @@ prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
 bindir ?= $(prefix)/bin
-libexecdir ?= $(prefix)/lib
+libdir ?= $(prefix)/lib
 BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-# TODO: separate data and binaries properly
-DATA_INSTALL_DIR = $(DESTDIR)$(libexecdir)/openra
+DATA_INSTALL_DIR = $(DESTDIR)$(libdir)/openra
 
 # install tools
 RM = rm
@@ -355,7 +354,7 @@ install-shortcuts:
 	@echo "#!/bin/sh" > openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra
 	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' >> openra
-	@echo 'EXECDIR="$${ROOTDIR}'"$(libexecdir)"'"' >> openra
+	@echo 'EXECDIR="$${ROOTDIR}'"$(libdir)"'"' >> openra
 	@echo 'cd "$${EXECDIR}/openra"' >> openra
 	@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
@@ -365,7 +364,7 @@ install-shortcuts:
 	@echo "#!/bin/sh" >  openra-editor
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra-editor
 	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' >> openra-editor
-	@echo 'EXECDIR="$${ROOTDIR}'"$(libexecdir)"'"' >> openra-editor
+	@echo 'EXECDIR="$${ROOTDIR}'"$(libdir)"'"' >> openra-editor
 	@echo 'cd "$${EXECDIR}/openra"' >> openra-editor
 	@echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"