summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-04 00:28:17 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-04 00:28:17 +0200
commit9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch)
tree3d4a19a910d34be6ee7cd4841876a4318d5c243d /Makefile
parentccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff)
parent09bf506c34a73d587c999ce161a0714159e1e5b6 (diff)
downloadmpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2
mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz
Merge svn changes up to r28461
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c1525b0e76..209414b6d5 100644
--- a/Makefile
+++ b/Makefile
@@ -873,8 +873,8 @@ vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER)
VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
vidix/pci_names.h vidix/pci_vendors.h
-$(VIDIX_PCI_FILES): vidix/pci.db vidix/pci_db2c.awk
- awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB)
+$(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db
+ awk -f $^ $(VIDIX_PCIDB)
VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d))
VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o))
@@ -909,7 +909,7 @@ install-mencoder-man-en: install-mplayer-man-en
install-mplayer-man-en:
if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi
- $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
+ $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
@@ -919,7 +919,7 @@ endef
define MPLAYER_MAN_RULE
install-mplayer-man-$(lang):
if test ! -d $(MANDIR)/$(lang)/man1 ; then $(INSTALL) -d $(MANDIR)/$(lang)/man1 ; fi
- $(INSTALL) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
+ $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
endef
$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))