Skip to content

F
ffmpeg-mt
Commit 5c91762c authored by diego's avatar diego
Browse files
Options

cosmetics: Use uppercase names for installation directories in makefiles. 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9776 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent df8809dd
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
Makefile
View file @ 5c91762c
...@@ -143,20 +143,20 @@ install-progs: $(PROGS) install-libs ...@@ -143,20 +143,20 @@ install-progs: $(PROGS) install-libs
else else
install-progs: $(PROGS) install-progs: $(PROGS)
endif endif
install -d "$(bindir)" install -d "$(BINDIR)"
install -c -m 755 $(PROGS) "$(bindir)" install -c -m 755 $(PROGS) "$(BINDIR)"
# Create the Windows installer. # Create the Windows installer.
wininstaller: all install wininstaller: all install
makensis ffinstall.nsi makensis ffinstall.nsi
install-man: install-man:
install -d "$(mandir)/man1" install -d "$(MANDIR)/man1"
install -m 644 $(MANPAGES) "$(mandir)/man1" install -m 644 $(MANPAGES) "$(MANDIR)/man1"
install-vhook: videohook install-vhook: videohook
install -d "$(shlibdir)/vhook" install -d "$(SHLIBDIR)/vhook"
install -m 755 $(HOOKS) "$(shlibdir)/vhook" install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
install-libs: install-libs:
$(MAKE) -C libavutil install-libs $(MAKE) -C libavutil install-libs
...@@ -185,14 +185,14 @@ endif ...@@ -185,14 +185,14 @@ endif
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
uninstall-progs: uninstall-progs:
rm -f $(addprefix $(bindir)/, $(ALLPROGS)) rm -f $(addprefix $(BINDIR)/, $(ALLPROGS))
uninstall-man: uninstall-man:
rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES)) rm -f $(addprefix $(MANDIR)/man1/,$(ALLMANPAGES))
uninstall-vhook: uninstall-vhook:
rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS)) rm -f $(addprefix $(SHLIBDIR)/vhook/,$(ALLHOOKS))
-rmdir "$(shlibdir)/vhook/" -rmdir "$(SHLIBDIR)/vhook/"
uninstall-libs: uninstall-libs:
$(MAKE) -C libavutil uninstall-libs $(MAKE) -C libavutil uninstall-libs
...@@ -205,7 +205,7 @@ uninstall-headers: ...@@ -205,7 +205,7 @@ uninstall-headers:
$(MAKE) -C libavcodec uninstall-headers $(MAKE) -C libavcodec uninstall-headers
$(MAKE) -C libavformat uninstall-headers $(MAKE) -C libavformat uninstall-headers
$(MAKE) -C libpostproc uninstall-headers $(MAKE) -C libpostproc uninstall-headers
-rmdir "$(incdir)" -rmdir "$(INCDIR)"
depend dep: .depend .vhookdep depend dep: .depend .vhookdep
$(MAKE) -C libavutil depend $(MAKE) -C libavutil depend
......
common.mak
View file @ 5c91762c
...@@ -70,37 +70,37 @@ install: install-libs install-headers ...@@ -70,37 +70,37 @@ install: install-libs install-headers
install-libs: $(INSTLIBTARGETS) install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME) install-lib-shared: $(SLIBNAME)
install -d "$(shlibdir)" install -d "$(SHLIBDIR)"
install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
cd "$(shlibdir)" && \ cd "$(SHLIBDIR)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(shlibdir)" && \ cd "$(SHLIBDIR)" && \
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME) ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
$(SLIB_INSTALL_EXTRA_CMD) $(SLIB_INSTALL_EXTRA_CMD)
install-lib-static: $(LIB) install-lib-static: $(LIB)
install -d "$(libdir)" install -d "$(LIBDIR)"
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(LIBDIR)"
$(LIB_INSTALL_EXTRA_CMD) $(LIB_INSTALL_EXTRA_CMD)
install-headers: install-headers:
install -d "$(incdir)" install -d "$(INCDIR)"
install -d "$(libdir)/pkgconfig" install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)" install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
uninstall: uninstall-libs uninstall-headers uninstall: uninstall-libs uninstall-headers
uninstall-libs: uninstall-libs:
-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \ -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
"$(shlibdir)/$(SLIBNAME)" \ "$(SHLIBDIR)/$(SLIBNAME)" \
"$(shlibdir)/$(SLIBNAME_WITH_VERSION)" "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-rm -f "$(libdir)/$(LIB)" -rm -f "$(LIBDIR)/$(LIB)"
uninstall-headers:: uninstall-headers::
rm -f $(addprefix "$(incdir)/",$(HEADERS)) rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
rm -f "$(libdir)/pkgconfig/lib$(NAME).pc" rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
.PHONY: all depend dep clean distclean install* uninstall* .PHONY: all depend dep clean distclean install* uninstall*
......
configure
View file @ 5c91762c
...@@ -1853,11 +1853,11 @@ echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH ...@@ -1853,11 +1853,11 @@ echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
echo "PREFIX=$PREFIX" >> config.mak echo "PREFIX=$PREFIX" >> config.mak
echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak
echo "libdir=\$(DESTDIR)$libdir" >> config.mak echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
echo "incdir=\$(DESTDIR)$incdir" >> config.mak echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
echo "bindir=\$(DESTDIR)$bindir" >> config.mak echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
echo "mandir=\$(DESTDIR)$mandir" >> config.mak echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
echo "MAKE=$make" >> config.mak echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment