From 9a1143111aabeedc13ec27b28cc81426f4dbf147 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 25 Sep 2011 20:21:11 +0000
Subject: add -f to ln to force creation of links so that install targets can
 install over existing builds (Closes #3413815 from Jacob Lee)

svn path=/trunk/; revision=15344
---
 packages/Makefile            | 4 ++--
 packages/darwin_app/Makefile | 8 ++++----
 packages/linux_make/Makefile | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile b/packages/Makefile
index fa3e2de8..c3cf6c86 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -122,10 +122,10 @@ pd_install: pd
 	install -d $(DESTDIR)$(libpddir)/startup
 # libdir
 	cd $(DESTDIR)$(libpddir)/startup && \
-		ln -s ../extra/libdir/ libdir
+		ln -s -f ../extra/libdir/ libdir
 # pdlua
 	cd $(DESTDIR)$(libpddir)/startup && \
-		ln -s ../extra/pdlua/ pdlua
+		ln -s -f ../extra/pdlua/ pdlua
 else
 #----------------------------------------------------------------------------#
 # old build system
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index bfdc41c1..927718ae 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -162,15 +162,15 @@ darwin_app_core: darwin_app_wrapper
 		pd_install 
 	install -d "$(PD_APP_CONTENTS)/Resources/bin"
 	cd "$(PD_APP_CONTENTS)/Resources" && \
-		ln -s tcl Scripts
+		ln -s -f tcl Scripts
 	cd "$(PD_APP_CONTENTS)/Resources/bin" && \
 		test -e pdextended || ln -s pd pdextended
 # support for Info Panel Plugins mgmt
-	cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins
+	cd "$(PD_APP_CONTENTS)" && ln -s -f Resources/extra Plugins
 	install -p -m0644 org.puredata.pdextended.default.plist "$(PD_APP_CONTENTS)/"
 # since Pd-vanilla on Mac OS X doesn't have an 'include/pd' folder,
 # Pd-extended will mimic Pd-vanilla's include/pd until Pd-vanilla gets one
-	ln -s pdextended "$(PD_APP_CONTENTS)/Resources/include/pd"
+	ln -s -f pdextended "$(PD_APP_CONTENTS)/Resources/include/pd"
 
 
 #==============================================================================#
@@ -190,7 +190,7 @@ dmg:
 	hdiutil attach build.dmg
 	install -p $(DESTDIR)$(manualsdir)/Pd/ReadMe.html "/Volumes/$(VOLUME_NAME)"
 # add link to /Applications for easy install
-	ln -s /Applications /Volumes/$(VOLUME_NAME)/Applications
+	ln -s -f /Applications /Volumes/$(VOLUME_NAME)/Applications
 # Install to .background for easier manual DS_Store makeing 
 	install -d "/Volumes/$(VOLUME_NAME)/.background"
 # The full path to the background image needs to be added to .DS_Store to work
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 1b023cc2..fe5fddd5 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -80,7 +80,7 @@ package: $(PACKAGE_TYPE)
 tarbz2: installer_makefile installer_readme
 	install -p $(packages_src)/linux_make/default.pdextended $(DESTDIR)$(libpddir)
 	mv $(DESTDIR)$(bindir)/pd $(DESTDIR)$(bindir)/pd-extended
-	ln -s $(bindir)/pd-extended $(DESTDIR)$(bindir)/pd
+	ln -s -f $(bindir)/pd-extended $(DESTDIR)$(bindir)/pd
 	mv $(DESTDIR)$(prefix) $(DESTDIR)$(PACKAGE_NAME)
 	cd $(DESTDIR) && \
 		tar cjf $(PACKAGE_NAME).tar.bz2  $(PACKAGE_NAME)
@@ -125,7 +125,7 @@ deb: $(bindir)
 		$(DESTDIR)/etc/init.d/
 # default prefs file
 	install -d $(DESTDIR)/etc/pd-extended
-	ln -s $(libpddir)/default.pdextended \
+	ln -s -f $(libpddir)/default.pdextended \
 		$(DESTDIR)/etc/pd-extended/default.pdextended
 	install -p $(packages_src)/linux_make/default.pdextended $(DESTDIR)$(libpddir)
 # emacs mode for .pd files
-- 
cgit v1.2.1