diff options
Diffstat (limited to 'cross/avrdude/patches/patch-aa')
| -rw-r--r-- | cross/avrdude/patches/patch-aa | 72 |
1 files changed, 44 insertions, 28 deletions
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa index 2c9a3110c24..977401d81a6 100644 --- a/cross/avrdude/patches/patch-aa +++ b/cross/avrdude/patches/patch-aa @@ -1,30 +1,46 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $ +$NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $ ---- Makefile.in.org Tue Jul 8 10:04:00 2003 -+++ Makefile.in Tue Jul 8 10:03:55 2003 -@@ -190,14 +190,9 @@ - lists.c \ - lists.h \ - main.c \ -- par.c \ -- par.h \ - pgm.c \ - pgm.h \ - pindefs.h \ -- ppi.c \ -- ppi.h \ -- ppiwin.c \ - serial.h \ - ser_posix.c \ - ser_win32.c \ -@@ -221,8 +216,8 @@ +--- Makefile.in.orig 2006-10-09 16:48:14.000000000 +0200 ++++ Makefile.in 2006-12-11 17:05:32.000000000 +0100 +@@ -233,6 +233,7 @@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ ++egconfdir = @egconfdir@ + target = @target@ + target_alias = @target_alias@ + target_cpu = @target_cpu@ +@@ -962,12 +963,12 @@ + done + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(egconfdir)" || $(mkdir_p) "$(DESTDIR)$(egconfdir)" + @list='$(sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egconfdir)/$$f'"; \ ++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egconfdir)/$$f"; \ + done - am_avrdude_OBJECTS = config_gram.$(OBJEXT) lexer.$(OBJEXT) avr.$(OBJEXT) \ - avr910.$(OBJEXT) config.$(OBJEXT) confwin.$(OBJEXT) \ -- fileio.$(OBJEXT) lists.$(OBJEXT) main.$(OBJEXT) par.$(OBJEXT) \ -- pgm.$(OBJEXT) ppi.$(OBJEXT) ppiwin.$(OBJEXT) \ -+ fileio.$(OBJEXT) lists.$(OBJEXT) main.$(OBJEXT) \ -+ pgm.$(OBJEXT) \ - ser_posix.$(OBJEXT) ser_win32.$(OBJEXT) stk500.$(OBJEXT) \ - term.$(OBJEXT) - avrdude_OBJECTS = $(am_avrdude_OBJECTS) + uninstall-sysconfDATA: +@@ -1378,11 +1379,12 @@ + + # This will get run before the config file is installed. + backup-avrdude-conf: +- @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" +- @if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \ +- cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \ +- ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \ +- fi ++ @echo "No backup of avrdude.conf in ${DESTDIR}${sysconfdir} required" ++# @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" ++# @if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \ ++# cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \ ++# ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \ ++# fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |