diff options
Diffstat (limited to 'cross/avrdude/patches/patch-aa')
| -rw-r--r-- | cross/avrdude/patches/patch-aa | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa index 1828b082ec7..d132afe78ee 100644 --- a/cross/avrdude/patches/patch-aa +++ b/cross/avrdude/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.4 2009/08/27 15:34:48 hasso Exp $ - Fix the SUBDIRS stuff so it actually works right with multiple automake versions. @@ -7,21 +7,10 @@ $NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ 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 +--- Makefile.am.orig 2009-03-06 21:09:11 +0100 ++++ Makefile.am +@@ -151,7 +151,8 @@ avrdude_SOURCES = \ --#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 -sysconf_DATA = avrdude.conf @@ -29,7 +18,9 @@ $NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ +egconf_DATA = avrdude.conf install-exec-local: backup-avrdude-conf -@@ -142,7 +140,5 @@ + +@@ -160,8 +161,6 @@ distclean-local: + # This will get run before the config file is installed. backup-avrdude-conf: - @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" |