diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 20:32:52 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 20:32:52 +0000 |
| commit | 0c5d191e7c511440cd0010cb3fcee43432e3e143 (patch) | |
| tree | 19a7b6632b3856bcdf66c4dee5aa08617e3b7b52 | |
| parent | 03677644f7e91b793859ba29037dfd4bef8763bf (diff) | |
| download | usdx-0c5d191e7c511440cd0010cb3fcee43432e3e143.tar.gz usdx-0c5d191e7c511440cd0010cb3fcee43432e3e143.tar.xz usdx-0c5d191e7c511440cd0010cb3fcee43432e3e143.zip | |
- Do not make plugins. Block on Mac OS X
- iconv ambiguity on mac os x solved (used /sw/lib/ one with missing symbols instead of /usr/lib one) (for the 2nd time)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1910 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | unicode/Makefile.in | 5 | ||||
| -rw-r--r-- | unicode/src/Makefile.in | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/unicode/Makefile.in b/unicode/Makefile.in index 1b4f7707..535f7dc9 100644 --- a/unicode/Makefile.in +++ b/unicode/Makefile.in @@ -114,7 +114,7 @@ BUILD_TARGETS = all debug release rebuild build .PHONY: $(BUILD_TARGETS) $(BUILD_TARGETS): all-deps $(MAKE) -C $(USDX_SRC_DIR) $@ - $(MAKE) -C $(USDX_PLUGIN_DIR) all +# $(MAKE) -C $(USDX_PLUGIN_DIR) all .PHONY: all-deps all-deps: @@ -215,7 +215,8 @@ install-strip: install .PHONY: install-all -install-all: install-exec install-plugins install-data +#install-all: install-exec install-plugins install-data +install-all: install-exec install-data .PHONY: install-exec install-exec: diff --git a/unicode/src/Makefile.in b/unicode/src/Makefile.in index 3d4b6def..06e62c43 100644 --- a/unicode/src/Makefile.in +++ b/unicode/src/Makefile.in @@ -122,7 +122,7 @@ endif LIBS ?= @LIBS@ LDFLAGS ?= @LDFLAGS@ -linkflags := $(sort $(LDFLAGS) $(LIBS)) +linkflags := -L/usr/lib $(sort $(LDFLAGS) $(LIBS)) ifneq ($(linkflags),) PLINKFLAGS := -k"$(linkflags)" endif |