[linux-dvb] [patch 3/6] rename scan into dvbscan again

[Ludwig Nussel]

On Thursday 07 September 2006 19:38, Johannes Stezenbach wrote:
> On Thu, Sep 07, 2006 at 03:08:20PM +0200, Ludwig Nussel wrote:
> > Change got lost during Makefile refactoring
> 
> It isn't necessary to rename to source files for renaming
> the binaries. A small Makefile patch would be better.

Here's a simpler Patch:

Signed-off-by: lnussel at suse.de

diff -r 3a6c1a1180c6 util/scan/Makefile
--- a/util/scan/Makefile	Fri Sep  8 12:41:56 2006
+++ b/util/scan/Makefile	Fri Sep  8 15:09:35 2006
@@ -10,7 +10,7 @@
 
 binaries = scan
 
-inst_bin = $(binaries)
+inst_bin = dvbscan
 
 removing = atsc_psip_section.c atsc_psip_section.h
 
@@ -20,6 +20,9 @@
 .PHONY: all
 
 all: $(binaries)
+
+dvbscan: scan
+	/bin/cp scan dvbscan
 
 $(binaries): $(objects)
 
diff -r 3a6c1a1180c6 Make.rules
--- a/Make.rules	Fri Sep  8 12:41:56 2006
+++ b/Make.rules	Fri Sep  8 15:09:35 2006
@@ -48,7 +48,7 @@
 	$(AR) rcs $@ $^
 clean::
 	$(RM) -f $(prerequisites) $(objects) $(libraries) $(binaries) $(removing) *~
-install::
+install:: $(inst_bin) $(libraries)
 ifneq ($(includes),)
 	mkdir -p $(DESTDIR)$(prefix)/include/$(lib_name)
 	install -m 644 $(includes) $(DESTDIR)$(prefix)/include/$(lib_name)/
@@ -80,7 +80,7 @@
 clean::
 	@echo cleaning
 	@$(RM) -f $(prerequisites) $(objects) $(libraries) $(binaries) $(removing) *~
-install::
+install:: $(inst_bin) $(libraries)
 ifneq ($(includes),)
 	@echo installing headers
 	@mkdir -p $(DESTDIR)$(prefix)/include/$(lib_name)

-- 
 (o_   Ludwig Nussel
 //\   SUSE LINUX Products GmbH, Development
 V_/_  http://www.suse.de/