diff options
Diffstat (limited to 'cross/avrdude/patches/patch-aa')
| -rw-r--r-- | cross/avrdude/patches/patch-aa | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa index 977401d81a6..1828b082ec7 100644 --- a/cross/avrdude/patches/patch-aa +++ b/cross/avrdude/patches/patch-aa @@ -1,33 +1,35 @@ -$NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $ +$NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ ---- 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 +- Fix the SUBDIRS stuff so it actually works right with multiple automake + versions. + +- Use supported automake methods to install the example config file to + egconfdir instead of hacking the configure script and Makefile.in directly. + + +--- Makefile.am.orig 2006-09-21 03:18:44.000000000 -0400 ++++ Makefile.am 2007-09-28 12:54:35.406518000 -0400 +@@ -36,9 +36,6 @@ + lexer.c + +-#SUBDIRS = doc @WINDOWS_DIRS@ +-#DIST_SUBDIRS = doc windows +- +-SUBDIRS = @SUBDIRS_AC@ +-DIST_SUBDIRS = @DIST_SUBDIRS_AC@ ++SUBDIRS = @DOC_DIR@ @WINDOWS_DIRS@ ++DIST_SUBDIRS = doc windows + + AM_YFLAGS = -d +@@ -133,5 +130,6 @@ + man_MANS = avrdude.1 - uninstall-sysconfDATA: -@@ -1378,11 +1379,12 @@ +-sysconf_DATA = avrdude.conf ++egconfdir= ${datadir}/examples/avrdude ++egconf_DATA = avrdude.conf + install-exec-local: backup-avrdude-conf +@@ -142,7 +140,5 @@ # This will get run before the config file is installed. backup-avrdude-conf: - @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" @@ -35,12 +37,6 @@ $NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $ - 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: ++ @echo "No back up of avrdude.conf in ${DESTDIR}${sysconfdir} is required" ++ @echo "because we simply install an example into ${DESTDIR}${egconfdir}" ++ @echo "and leave it to the user to install/update the actual working copy" |