[linux-dvb] [patch 1/6] honor DESTDIR and libdir in order toeaserpm builds

Sergei Haller sergei at sergei-haller.de
Fri Sep 8 00:57:31 CEST 2006


On Thu, 7 Sep 2006, Ludwig Nussel (LN) wrote:

LN> Signed-off-by: lnussel at suse.de
LN> 
LN> diff -r 56f0dba7274c Make.rules
LN> --- a/Make.rules	Wed Sep  6 16:17:34 2006
LN> +++ b/Make.rules	Thu Sep  7 14:45:13 2006
LN> @@ -31,6 +31,10 @@
LN>  prefix = /usr
LN>  endif
LN>  
LN> +lib=lib
LN> +libdir=$(prefix)/$(lib)
LN> +datadir=$(prefix)/share
LN> +
LN>  ifeq ($(V),1)
LN>  %.o: %.c
LN>  	$(CC) -c $(CPPFLAGS) $(CFLAGS) -MMD -o $@ $< $(filter-out %.h %.c,$^)
LN> @@ -46,16 +50,16 @@
LN>  	$(RM) -f $(prerequisites) $(objects) $(libraries) $(binaries) $(removing) *~
LN>  install::
LN>  ifneq ($(includes),)
LN> -	mkdir -p $(prefix)/include/$(lib_name)
LN> -	install -m 644 $(includes) $(prefix)/include/$(lib_name)/
LN> +	mkdir -p $(DESTDIR)$(prefix)/include/$(lib_name)
LN> +	install -m 644 $(includes) $(DESTDIR)$(prefix)/include/$(lib_name)/
LN>  endif
LN>  ifneq ($(libraries),)
LN> -	mkdir -p $(prefix)/lib
LN> -	install -m 644 $(libraries) $(prefix)/lib/
LN> +	mkdir -p $(DESTDIR)$(libdir)
LN> +	install -m 644 $(libraries) $(libdir)
                                    ^^^^^^^^
you probably want $(DESTDIR)$(libdir) here as well...

LN>  endif
LN>  ifneq ($(inst_bin),)
LN> -	mkdir -p $(prefix)/bin
LN> -	install -m 755 $(inst_bin) $(prefix)/bin/
LN> +	mkdir -p $(DESTDIR)$(prefix)/bin
LN> +	install -m 755 $(inst_bin) $(DESTDIR)$(prefix)/bin/
LN>  endif
LN>  else
LN>  %.o: %.c
LN> @@ -79,18 +83,18 @@
LN>  install::
LN>  ifneq ($(includes),)
LN>  	@echo installing headers
LN> -	@mkdir -p $(prefix)/include/$(lib_name)
LN> -	@install -m 644 $(includes) $(prefix)/include/$(lib_name)/
LN> +	@mkdir -p $(DESTDIR)$(prefix)/include/$(lib_name)
LN> +	@install -m 644 $(includes) $(DESTDIR)$(prefix)/include/$(lib_name)/
LN>  endif
LN>  ifneq ($(libraries),)
LN>  	@echo installing libraries
LN> -	@mkdir -p $(prefix)/lib
LN> -	@install -m 644 $(libraries) $(prefix)/lib/
LN> +	@mkdir -p $(DESTDIR)$(libdir)
LN> +	@install -m 644 $(libraries) $(DESTDIR)$(libdir)
LN>  endif
LN>  ifneq ($(inst_bin),)
LN>  	@echo installing binaries
LN> -	@mkdir -p $(prefix)/bin
LN> -	@install -m 755 $(inst_bin) $(prefix)/bin/
LN> +	@mkdir -p $(DESTDIR)$(prefix)/bin
LN> +	@install -m 755 $(inst_bin) $(DESTDIR)$(prefix)/bin/
LN>  endif
LN>  endif
LN>  
LN> diff -r 56f0dba7274c util/scan/Makefile
LN> --- a/util/scan/Makefile	Wed Sep  6 16:17:34 2006
LN> +++ b/util/scan/Makefile	Thu Sep  7 14:45:13 2006
LN> @@ -15,6 +15,7 @@
LN>  removing = atsc_psip_section.c atsc_psip_section.h
LN>  
LN>  CPPFLAGS += -I../../include
LN> +CFLAGS += -DDATADIR=\"$(datadir)\"
LN>  
LN>  .PHONY: all
LN>  
LN> 



More information about the linux-dvb mailing list