blob: 1828b082ec799ef21f72a456391cbb8fc31f4fcf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
$NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $
- 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
-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}"
- @if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \
- cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \
- ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
- fi
+ @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"
|
