diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-11 01:03:07 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-11 01:03:07 +0000 |
| commit | 9b84086a100d735232ece8fcbed8a7d769e7f644 (patch) | |
| tree | 485c83a6d85327785522c2c27bc19fc2b801904c | |
| parent | 1817ea7e57581e92552793d182d409c459441b2f (diff) | |
| download | usdx-9b84086a100d735232ece8fcbed8a7d769e7f644.tar.gz usdx-9b84086a100d735232ece8fcbed8a7d769e7f644.tar.xz usdx-9b84086a100d735232ece8fcbed8a7d769e7f644.zip | |
fix installation and cleanup of media libs (should fix mac os bundles too)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2732 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | mediaplugin/Makefile.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mediaplugin/Makefile.in b/mediaplugin/Makefile.in index f433381d..60afab50 100644 --- a/mediaplugin/Makefile.in +++ b/mediaplugin/Makefile.in @@ -55,6 +55,7 @@ USDX_TARNAME := @PACKAGE_TARNAME@ USDX_SRC_DIR := $(top_srcdir)/src USDX_GAME_DIR := $(top_srcdir)/game +USDX_PLUGIN_DIR := $(USDX_GAME_DIR)/plugins USDX_TOOLS_DIR := $(top_srcdir)/tools USDX_BUILD_DIR := $(top_srcdir)/build USDX_LIB_DIR := $(USDX_SRC_DIR)/lib @@ -139,6 +140,9 @@ clean-game: $(RM) $(USDX_GAME_DIR)/*.log $(RM) $(USDX_GAME_DIR)/*.db $(RM) $(USDX_GAME_DIR)/*.ini + $(RM) $(USDX_PLUGIN_DIR)/media/*.dll + $(RM) $(USDX_PLUGIN_DIR)/media/*.so + $(RM) $(USDX_PLUGIN_DIR)/media/*.dylib -rmdir $(USDX_GAME_DIR)/screenshots -rmdir $(USDX_GAME_DIR)/playlists -rmdir $(USDX_GAME_DIR)/songs @@ -227,7 +231,9 @@ PPROCESSOR := @FPC_PROCESSOR@ .PHONY: install-plugins install-plugins: $(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins" - $(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins" + $(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/plugins" \ + RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/plugins" \ + install-data-recursive .PHONY: install-data install-data: |