diff -uNr ufoai-svn20070726/Makefile.in ufoai-svn20070726-new/Makefile.in

--- ufoai-svn20070726/Makefile.in	2007-09-27 01:51:09 +0400

+++ ufoai-svn20070726-new/Makefile.in	2007-09-29 10:24:56 +0400

@@ -40,8 +40,9 @@

 exec_prefix=@exec_prefix@

 BINDIR=@bindir@

 datarootdir=@datarootdir@

+ROOTDIR=@rootdir@

 DATADIR=@datadir@/ufoai

-INSTALL=./install-sh

+INSTALL=install -D

 VERSION=$(shell grep UFO_VERSION src/common/common.h | sed -e 's/.*UFO_VERSION \"\(.*\)\"/\1/')

@@ -137,9 +138,9 @@

 	@$(MAKE) maps

 # Create all pk3 files

 	@cd base && ./archives.sh

-	$(INSTALL) -d $(DATADIR)/base

+	$(INSTALL) -d $(ROOTDIR)/(DATADIR)/base

 # Copy them to datadir

-	$(INSTALL) -m 644 base/*.pk3 $(DATADIR)/base

+	$(INSTALL) -m 644 base/*.pk3 $(ROOTDIR)/$(DATADIR)/base

 #

 # Target to install the game executables and language files. It also creates a

@@ -148,18 +149,20 @@

 #

 install_exec: $(TARGETS)

 	@$(MAKE) lang

-	$(INSTALL) -d $(DATADIR)/base

+	$(INSTALL) -d $(ROOTDIR)/$(LOCALEDIR); echo "ROOTDIR=$(ROOTDIR) DATADIR=$(DATADIR)"

 # Copy each compiled file to datadir (with path)

-	for file in $(TARGETS); do $(INSTALL) -m 755 $$file $(DATADIR)/$$file; done

+	for file in $(TARGETS); do $(INSTALL) -m 755 $$file $(ROOTDIR)/$(DATADIR)/$$file; echo $$file; done

 # Copy all language files

-	for dir in base/i18n/*; do $(INSTALL) -m 644 $$dir/LC_MESSAGES/ufoai.mo $(DATADIR)/$$dir/LC_MESSAGES/ufoai.mo; done

+#	cd base/i18n

+#	for dir in *; do $(INSTALL) -m 644 $$dir/LC_MESSAGES/ufoai.mo $(ROOTDIR)/$(LOCALEDIR)/$$dir/LC_MESSAGES/ufoai.mo; done

+#	cd ../..

 # Create and install run scripts

 	@echo "#!/bin/sh" > ufo.sh

 	@echo "cd $(DATADIR); ./ufo \$$*; exit \$$?" >> ufo.sh

-	$(INSTALL) -m 755 ufo.sh $(BINDIR)/ufo

+	$(INSTALL) -m 755 ufo.sh $(ROOTDIR)/bin/ufo

 	@echo "#!/bin/sh" > ufoded.sh

 	@echo "cd $(DATADIR); ./ufoded \$$*; exit \$$?" >> ufoded.sh

-	$(INSTALL) -m 755 ufoded.sh $(BINDIR)/ufoded

+	$(INSTALL) -m 755 ufoded.sh $(ROOTDIR)/bin/ufoded

 #######################################################################