diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-10-02 20:25:38 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-10-02 20:25:38 +0000 |
| commit | 0e106cf0718eaaf2c9b5fae9631e14acb8de8d03 (patch) | |
| tree | 8b328563cd296c6a08dcc0652988ebe87e013004 | |
| parent | 9824911696452b978cb3df750527d6c7ee2d9853 (diff) | |
added LN_S variable so it can be set to 'cp -a' on MinGW
svn path=/trunk/; revision=15456
| -rw-r--r-- | packages/Makefile | 11 | ||||
| -rw-r--r-- | packages/Makefile.buildlayout | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/packages/Makefile b/packages/Makefile index 54ebfc07..f1be48f5 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -206,11 +206,11 @@ noncvs_install: pd_startup_install: install -d $(DESTDIR)$(libpddir)/startup cd $(DESTDIR)$(libpddir)/startup && \ - ln -s -f ../extra/libdir/libdir.$(EXTENSION) 0.libdir.$(EXTENSION) && \ - ln -s -f ../extra/vanilla/list.$(EXTENSION) 1.list.$(EXTENSION) && \ - ln -s -f ../extra/vanilla/ vanilla && \ - ln -s -f ../extra/extra/ extra && \ - ln -s -f ../extra/pdlua/ pdlua + $(LN_S) -f ../extra/libdir/libdir.$(EXTENSION) 0.libdir.$(EXTENSION) && \ + $(LN_S) -f ../extra/vanilla/list.$(EXTENSION) 1.list.$(EXTENSION) && \ + $(LN_S) -f ../extra/vanilla/ vanilla && \ + $(LN_S) -f ../extra/extra/ extra && \ + $(LN_S) -f ../extra/pdlua/ pdlua #==============================================================================# @@ -431,5 +431,6 @@ test_locations: @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" @echo "HAVE_AUTOGEN_SH --$(HAVE_AUTOGEN_SH)--" + @echo "LN_S $(LN_S)" .PHONY = abstractions doc externals pd pd_install pd_startup_install extended_install install devel_install abstractions_install doc_install extensions_install externals_install noncvs_install license_install welcome_install readme_install doc_format set_version unset_version abstractions_clean doc_clean externals_clean pd_clean clean distclean test_locations diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout index e927c4e5..53a1a155 100644 --- a/packages/Makefile.buildlayout +++ b/packages/Makefile.buildlayout @@ -41,21 +41,25 @@ ifeq ($(UNAME),Linux) OS_NAME = linux EXTENSION = pd_linux DYLIB_EXTENSION = so + LN_S = ln -s endif ifeq ($(UNAME),Darwin) OS_NAME = darwin EXTENSION = pd_darwin DYLIB_EXTENSION = dylib + LN_S = ln -s endif ifeq (MINGW,$(findstring MINGW,$(UNAME))) OS_NAME = windows EXTENSION = dll DYLIB_EXTENSION = dll + LN_S = cp -a endif ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) OS_NAME = windows EXTENSION = dll DYLIB_EXTENSION = dll + LN_S = ln -s endif # which CPU to compile for UNAME_MACHINE := $(shell uname -m) |