98b9a79877
- install documentation - preserve configuration - honor CFLAGS - add multimedia in CATEGORIES - new option WITHOUT_DVD - Fix build for 64bit - Fix linker warnings in STABLE
20 lines
719 B
Text
20 lines
719 B
Text
--- Makefile.orig Fri Nov 28 22:54:25 2003
|
|
+++ Makefile Sat Dec 27 18:11:03 2003
|
|
@@ -10,6 +10,8 @@
|
|
include Makefile.opts
|
|
endif
|
|
|
|
+CCFLAGS += ${CFLAGS}
|
|
+
|
|
|
|
################################################################################
|
|
# Common options
|
|
@@ -176,7 +178,7 @@
|
|
$(INSTALL) -m 644 $(PLUGINS:%=bin/%.so) $(DESTDIR)$(libdir)/videolan/vls
|
|
endif
|
|
mkdir -p $(DESTDIR)$(sysconfdir)/videolan/vls
|
|
- test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls
|
|
+ test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg-dist
|
|
@echo "Installation succeeded."
|
|
|
|
uninstall:
|