[Mplayer-cvslog] CVS: main Makefile,1.123,1.124

pl pl at mplayer.dev.hu
Sun Dec 16 12:33:01 CET 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv31846

Modified Files:
	Makefile 
Log Message:
Patch by Adam Di Carlo <adam at onshore-devel.com>:
 * Makefile: use a mandir setting, default to ${prefix}/man; this lets
   us override it for Debian for instance which uses /usr/share/man
   rather than /usr/man


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Makefile	10 Dec 2001 22:40:14 -0000	1.123
+++ Makefile	16 Dec 2001 11:32:59 -0000	1.124
@@ -17,6 +17,7 @@
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
+MANDIR = ${prefix}/man
 
 # a BSD compatible 'install' program
 INSTALL = install
@@ -189,11 +190,11 @@
 ifeq ($(GUI),yes)
 	-ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
 endif
-	if test ! -d $(prefix)/man/man1 ; then mkdir -p $(prefix)/man/man1; fi
-	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+	if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
+	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
 ifeq ($(MENCODER),yes)
 	$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
-	$(INSTALL) -c -m 644 DOCS/mencoder.1 $(prefix)/man/man1/mencoder.1
+	$(INSTALL) -c -m 644 DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
 endif
 
 ifeq ($(CSS_USE),yes)
@@ -205,9 +206,9 @@
 endif
 
 uninstall:
-	-rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(prefix)/man/man1/mplayer.1
+	-rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(MANDIR)/man1/mplayer.1
 	-rm -f $(BINDIR)/$(PRG_FIBMAP)
-	-rm -f  $(BINDIR)/$(PRG_MENCODER) $(prefix)/man/man1/mencoder.1
+	-rm -f  $(BINDIR)/$(PRG_MENCODER) $(MANDIR)/man1/mencoder.1
 	@echo "Uninstall completed"
 
 clean:




More information about the MPlayer-cvslog mailing list