[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

legatvs legatvs at gmail.com
Wed Apr 1 14:44:51 UTC 2009


The following commit has been merged in the master branch:
commit 8df566d099134d2a2f10ed2a7b1d2d1412cd6471
Author: legatvs <legatvs at gmail.com>
Date:   Thu Feb 19 15:24:45 2009 +0200

    Makefile: additional INSTALL vars, WITH_CHECK support.

diff --git a/Makefile b/Makefile
index 7402983..167817f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ datadir     = $(datarootdir)
 mandir      = $(datarootdir)/man
 man1dir     = $(mandir)/man1
 
-INSTALL     = install
+INSTALL     = install -c
+INSTALL_D   = install -d
+INSTALL_M   = install -c -m 444
 RM          = rm -f
 PERL        = perl
 POD2MAN     = pod2man
@@ -17,6 +19,7 @@ AWK         = awk
 TR          = tr
 
 WITH_MAN    = yes
+WITH_CHECK  = yes
 
 ifndef V
 QUIET_POD2MAN   = @echo POD2MAN clive.1;
@@ -30,34 +33,37 @@ RELEASE := \
 all: checks
 
 checks:
+ifeq ($(WITH_CHECK),yes)
 	@echo Check for required Perl modules...
 	@echo -n URI::Escape ...
-	@echo `$(PERL) -MURI::Escape -e "print 'ok'" 2>/dev/null || \
-        echo 'NO'`
+	@echo `$(PERL) -MURI::Escape -e "print 'yes'" 2>/dev/null || \
+        echo 'no'`
 	@echo -n XML::Simple ...
-	@echo `$(PERL) -MXML::Simple -e "print 'ok'" 2>/dev/null || \
-        echo 'NO'`
+	@echo `$(PERL) -MXML::Simple -e "print 'yes'" 2>/dev/null || \
+        echo 'no'`
 	@echo -n WWW::Curl 4.05+ ...
-	@echo `$(PERL) -e "use WWW::Curl 4.05; print 'ok'" 2>/dev/null || \
-        echo 'NO'`
+	@echo `$(PERL) -e "use WWW::Curl 4.05; print 'yes'" 2>/dev/null || \
+        echo 'no'`
 	@echo -n HTML::TokeParser ...
-	@echo `$(PERL) -MHTML::TokeParser -e "print 'ok'" 2>/dev/null || \
-        echo 'NO'`
+	@echo `$(PERL) -MHTML::TokeParser -e "print 'yes'" 2>/dev/null || \
+        echo 'no'`
 	@echo -n Config::Tiny ...
-	@echo `$(PERL) -MConfig::Tiny -e "print 'ok'" 2>/dev/null || \
-        echo 'NO'`
+	@echo `$(PERL) -MConfig::Tiny -e "print 'yes'" 2>/dev/null || \
+        echo 'no'`
 	@echo -n BerkeleyDB ...
-	@echo `$(PERL) -MBerkeleyDB -e "print 'ok'" 2>/dev/null || \
-        echo 'NO'`
-	@echo done. If all checked OK, run \"make install\". See INSTALL for notes.
+	@echo `$(PERL) -MBerkeleyDB -e "print 'yes'" 2>/dev/null || \
+        echo 'no'`
+else
+	@echo 'Skip checks.'
+endif
 
 .PHONY: install uninstall
 install:
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL) -c clive $(DESTDIR)$(bindir)/clive
+	$(INSTALL_D) $(DESTDIR)$(bindir)
+	$(INSTALL) clive $(DESTDIR)$(bindir)/clive
 ifeq ($(WITH_MAN),yes)
-	$(INSTALL) -d $(DESTDIR)$(man1dir)
-	$(INSTALL) -c -m 444 clive.1 $(DESTDIR)$(man1dir)/clive.1
+	$(INSTALL_D) $(DESTDIR)$(man1dir)
+	$(INSTALL_M) clive.1 $(DESTDIR)$(man1dir)/clive.1
 endif
 
 uninstall:

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)



More information about the Pkg-perl-cvs-commits mailing list