aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-04-19 13:39:11 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-04-19 13:39:11 +0000
commit43983455b499d4355edfe1e69c7a93c58c7f2beb (patch)
tree13f7c23683fefbae1a2175e59a48fdb773192ff8
parent8030b5caf37443fecd8887a851be149c028dd810 (diff)
downloadusdx-43983455b499d4355edfe1e69c7a93c58c7f2beb.tar.gz
usdx-43983455b499d4355edfe1e69c7a93c58c7f2beb.tar.xz
usdx-43983455b499d4355edfe1e69c7a93c58c7f2beb.zip
better version for make and install the plugins
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1684 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Makefile.in2
-rw-r--r--plugins/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index aaf9b9a1..a5b6cb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,7 +229,7 @@ PPROCESSOR := @FPC_PROCESSOR@
.PHONY: install-plugins
install-plugins:
$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
- $(INSTALL) "$(USDX_BUILD_DIR)"/fpc-$(PPROCESSOR)-$(PPLATFORM)/lib* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+ $(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
.PHONY: install-data
install-data:
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 4bae46b3..98ab9e06 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -38,7 +38,7 @@ PPLATFORM := @FPC_PLATFORM@
PPROCESSOR := @FPC_PROCESSOR@
# Directories added to the unit path
-PUNIT_FLAGS := -FE../build/fpc-$(PPROCESSOR)-$(PPLATFORM) -Fu../build/fpc-$(PPROCESSOR)-$(PPLATFORM)
+PUNIT_FLAGS := -FE../game/plugins -FU../build/fpc-$(PPROCESSOR)-$(PPLATFORM) -Fu../build/fpc-$(PPROCESSOR)-$(PPLATFORM)
# Directory where compiled units (.ppu, .o and library files) are stored
PCUNIT_DIR := $(USDX_BUILD_DIR)/fpc-$(PPROCESSOR)-$(PPLATFORM)