cosmetics: Use uppercase names for installation directories in makefi…

…les. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9776 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
justinruggles · Jul 21, 2007 · 5c91762 · 5c91762
1 parent df8809d
commit 5c91762
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -143,20 +143,20 @@ install-progs: $(PROGS) install-libs
 else
 install-progs: $(PROGS)
 endif
-	install -d "$(bindir)"
-	install -c -m 755 $(PROGS) "$(bindir)"
+	install -d "$(BINDIR)"
+	install -c -m 755 $(PROGS) "$(BINDIR)"
 
 # Create the Windows installer.
 wininstaller: all install
 	makensis ffinstall.nsi
 
 install-man:
-	install -d "$(mandir)/man1"
-	install -m 644 $(MANPAGES) "$(mandir)/man1"
+	install -d "$(MANDIR)/man1"
+	install -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 install-vhook: videohook
-	install -d "$(shlibdir)/vhook"
-	install -m 755 $(HOOKS) "$(shlibdir)/vhook"
+	install -d "$(SHLIBDIR)/vhook"
+	install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
 
 install-libs:
 	$(MAKE) -C libavutil   install-libs
@@ -185,14 +185,14 @@ endif
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
 uninstall-progs:
-	rm -f $(addprefix $(bindir)/, $(ALLPROGS))
+	rm -f $(addprefix $(BINDIR)/, $(ALLPROGS))
 
 uninstall-man:
-	rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
+	rm -f $(addprefix $(MANDIR)/man1/,$(ALLMANPAGES))
 
 uninstall-vhook:
-	rm -f $(addprefix $(shlibdir)/vhook/,$(ALLHOOKS))
-	-rmdir "$(shlibdir)/vhook/"
+	rm -f $(addprefix $(SHLIBDIR)/vhook/,$(ALLHOOKS))
+	-rmdir "$(SHLIBDIR)/vhook/"
 
 uninstall-libs:
 	$(MAKE) -C libavutil   uninstall-libs
@@ -205,7 +205,7 @@ uninstall-headers:
 	$(MAKE) -C libavcodec  uninstall-headers
 	$(MAKE) -C libavformat uninstall-headers
 	$(MAKE) -C libpostproc uninstall-headers
-	-rmdir "$(incdir)"
+	-rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
 	$(MAKE) -C libavutil   depend

diff --git a/common.mak b/common.mak
@@ -70,37 +70,37 @@ install: install-libs install-headers
 install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
-	install -d "$(shlibdir)"
-	install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-	$(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-	cd "$(shlibdir)" && \
+	install -d "$(SHLIBDIR)"
+	install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+	$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+	cd "$(SHLIBDIR)" && \
 		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-	cd "$(shlibdir)" && \
+	cd "$(SHLIBDIR)" && \
 		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
 	$(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib-static: $(LIB)
-	install -d "$(libdir)"
-	install -m 644 $(LIB) "$(libdir)"
+	install -d "$(LIBDIR)"
+	install -m 644 $(LIB) "$(LIBDIR)"
 	$(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
-	install -d "$(incdir)"
-	install -d "$(libdir)/pkgconfig"
-	install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
-	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
+	install -d "$(INCDIR)"
+	install -d "$(LIBDIR)/pkgconfig"
+	install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
+	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
 
 uninstall-libs:
-	-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
-	       "$(shlibdir)/$(SLIBNAME)"            \
-	       "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-	-rm -f "$(libdir)/$(LIB)"
+	-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+	       "$(SHLIBDIR)/$(SLIBNAME)"            \
+	       "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+	-rm -f "$(LIBDIR)/$(LIB)"
 
 uninstall-headers::
-	rm -f $(addprefix "$(incdir)/",$(HEADERS))
-	rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
+	rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
+	rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*
 

diff --git a/configure b/configure
@@ -1853,11 +1853,11 @@ echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
 
 echo "PREFIX=$PREFIX" >> config.mak
 echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak
-echo "libdir=\$(DESTDIR)$libdir" >> config.mak
-echo "shlibdir=\$(DESTDIR)$shlibdir" >> config.mak
-echo "incdir=\$(DESTDIR)$incdir" >> config.mak
-echo "bindir=\$(DESTDIR)$bindir" >> config.mak
-echo "mandir=\$(DESTDIR)$mandir" >> config.mak
+echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
+echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
+echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
+echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
+echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
 echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak