diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
commit | 0c5c03d095485f7521d96cd44314f9a0ee826232 (patch) | |
tree | 1df111a8270ba417537931cc6e1a4952b3000ee9 /patches/CanFestival-3-20081204-1/fix-destdir.diff | |
parent | d3ee0775cadf505c4bae7b1df483d73bf8294815 (diff) | |
download | ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.gz ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.xz |
* patches: remove 'generic'-layer
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10711 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/CanFestival-3-20081204-1/fix-destdir.diff')
-rw-r--r-- | patches/CanFestival-3-20081204-1/fix-destdir.diff | 153 |
1 files changed, 153 insertions, 0 deletions
diff --git a/patches/CanFestival-3-20081204-1/fix-destdir.diff b/patches/CanFestival-3-20081204-1/fix-destdir.diff new file mode 100644 index 000000000..7251d1ed4 --- /dev/null +++ b/patches/CanFestival-3-20081204-1/fix-destdir.diff @@ -0,0 +1,153 @@ +Subject: add $(DESTDIR) to Makefile.in +From: Markus Messmer <mme@pengutronix.de> + +Makefile is not $(DESTDIR) aware, this patch adds some $(DESTDIR)s. + +Signed-off-by: Markus Messmer <mme@pengutronix.de> + +--- +# datum: 16.12.08 mme: könnte auch upstream +Index: CanFestival-3-20080926/drivers/timers_unix/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/drivers/timers_unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/drivers/timers_unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -48,8 +48,8 @@ + $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< + + install: +- mkdir -p $(PREFIX)/include/canfestival +- cp $(SRC_HFILES) $(PREFIX)/include/canfestival ++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival ++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival + + uninstall: + rm -f $(TARGET_HFILES) +Index: CanFestival-3-20080926/drivers/can_socket/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/drivers/can_socket/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/drivers/can_socket/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -56,8 +56,8 @@ + $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $< + + install: libcanfestival_$(CAN_DRIVER).so +- mkdir -p $(PREFIX)/lib/ +- cp $< $(PREFIX)/lib/ ++ mkdir -p $(DESTDIR)$(PREFIX)/lib/ ++ cp $< $(DESTDIR)$(PREFIX)/lib/ + + uninstall: + rm -f $(TARGET_SOFILES) +Index: CanFestival-3-20080926/drivers/unix/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/drivers/unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/drivers/unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -97,10 +97,10 @@ + $(BINUTILS_PREFIX)ranlib $@ + + install: libcanfestival_$(TARGET).a +- mkdir -p $(PREFIX)/lib/ +- mkdir -p $(PREFIX)/include/canfestival +- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/ +- cp $(SRC_HFILES) $(PREFIX)/include/canfestival ++ mkdir -p $(DESTDIR)$(PREFIX)/lib/ ++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival ++ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/ ++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival + + uninstall: + rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a +Index: CanFestival-3-20080926/src/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/src/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/src/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -87,8 +87,8 @@ + + install: + $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install +- mkdir -p $(PREFIX)/include/canfestival +- cp ../include/*.h $(PREFIX)/include/canfestival ++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival ++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival + + uninstall: + rm -rf $(PREFIX)/include/canfestival +@@ -114,10 +114,10 @@ + $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< + + install: libcanfestival.a +- mkdir -p $(PREFIX)/lib/ +- mkdir -p $(PREFIX)/include/canfestival +- cp libcanfestival.a $(PREFIX)/lib/ +- cp ../include/*.h $(PREFIX)/include/canfestival ++ mkdir -p $(DESTDIR)$(PREFIX)/lib/ ++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival ++ cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/ ++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival + + uninstall: + rm -f $(PREFIX)/lib/libcanfestival.a +Index: CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -87,8 +87,8 @@ + rm -f TestMaster.c + + install: TestMasterSlave +- mkdir -p $(PREFIX)/bin/ +- cp $< $(PREFIX)/bin/ ++ mkdir -p $(DESTDIR)$(PREFIX)/bin/ ++ cp $< $(DESTDIR)$(PREFIX)/bin/ + + uninstall: + rm -f $(PREFIX)/bin/TestMasterSlave +Index: CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:53.000000000 +0200 +@@ -74,8 +74,8 @@ + rm -f TestMaster.c + + install: TestMasterMicroMod +- mkdir -p $(PREFIX)/bin/ +- cp $< $(PREFIX)/bin/ ++ mkdir -p $(DESTDIR)$(PREFIX)/bin/ ++ cp $< $(DESTDIR)$(PREFIX)/bin/ + + uninstall: + rm -f $(PREFIX)/bin/TestMasterMicroMod +Index: CanFestival-3-20080926/objdictgen/Makefile.in +=================================================================== +--- CanFestival-3-20080926.orig/objdictgen/Makefile.in 2008-09-26 12:22:50.000000000 +0200 ++++ CanFestival-3-20080926/objdictgen/Makefile.in 2008-09-26 12:24:52.000000000 +0200 +@@ -35,19 +35,19 @@ + rm -rf gnosis_extract + + install: gnosis +- mkdir -p $(PREFIX)/objdictgen +- cp -r *.py* config doc doc_index examples gnosis $(PREFIX)/objdictgen +- chmod -R a+r $(PREFIX)/objdictgen +- mkdir -p $(PREFIX)/bin +- ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit +- chmod 755 $(PREFIX)/objdictgen/objdictedit.py +- ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen +- chmod 755 $(PREFIX)/objdictgen/objdictgen.py ++ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen ++ cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen ++ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit ++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py ++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen ++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py + + uninstall: +- rm -rf $(PREFIX)/objdictgen +- rm -f $(PREFIX)/bin/objdictedit +- rm -f $(PREFIX)/bin/objdictgen ++ rm -rf $(DESTDIR)$(PREFIX)/objdictgen ++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit ++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen + + clean: + |