aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-08-04 10:23:06 +0000
committerDiego Biurrun <diego@biurrun.de>2006-08-04 10:23:06 +0000
commite35a3b7d6500352c44834470212f2b6aa98f5805 (patch)
tree5d15a378ec47ef94a3fe57eb19a7d7f3886df726
parentafa615327b0176609975b2015892a74ef20aa28e (diff)
downloadffmpeg-e35a3b7d6500352c44834470212f2b6aa98f5805.tar.gz
Remove MinGW specialcasing and make shared library installation compatible
with MinGW where ln is emulated by cp. Originally committed as revision 5930 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak16
1 files changed, 4 insertions, 12 deletions
diff --git a/common.mak b/common.mak
index 8069d21f9d..40a655cdd4 100644
--- a/common.mak
+++ b/common.mak
@@ -59,16 +59,12 @@ install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)"
-ifeq ($(CONFIG_MINGW),yes)
- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
- ln -sf $(SLIBNAME_WITH_VERSION) \
- "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)"
- ln -sf $(SLIBNAME_WITH_VERSION) \
- "$(shlibdir)/$(SLIBNAME)"
-endif
+ cd "$(shlibdir)" && \
+ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+ cd "$(shlibdir)" && \
+ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
install-lib-static: $(LIB)
install -d "$(libdir)"
@@ -83,13 +79,9 @@ install-headers:
uninstall: uninstall-libs uninstall-headers
uninstall-libs:
-ifeq ($(CONFIG_MINGW),yes)
- -rm -f "$(prefix)/$(SLIBNAME)"
-else
-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
"$(shlibdir)/$(SLIBNAME)" \
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-endif
-rm -f "$(libdir)/$(LIB)"
uninstall-headers: