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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
Makefile.am | 6 +++---
shell/Makefile.am | 12 ++++++------
vgd/Makefile.am | 2 +-
vgdisplay/Makefile.am | 4 ++--
vgdisplay/Makefile.in | 2 +-
vgexpand/Makefile.am | 2 +-
vgping/Makefile.am | 2 +-
vgseer/Makefile.am | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5378bad..4b0d394 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,19 +11,19 @@ man_MANS = vgseer.1 viewglob.1 $(MANS_FULL)
viewglob.1:
rm -f viewglob.1.tmp
sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
- viewglob.1.in > viewglob.1.tmp
+ $(srcdir)/viewglob.1.in > viewglob.1.tmp
mv viewglob.1.tmp viewglob.1
vgseer.1:
rm -f vgseer.1.tmp
sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
- vgseer.1.in > vgseer.1.tmp
+ $(srcdir)/vgseer.1.in > vgseer.1.tmp
mv vgseer.1.tmp vgseer.1
vgd.1:
rm -f vgd.1.tmp
sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
- vgd.1.in > vgd.1.tmp
+ $(srcdir)/vgd.1.in > vgd.1.tmp
mv vgd.1.tmp vgd.1
EXTRA_DIST = COPYING2 HACKING viewglob.1.in vgseer.1.in vgd.1.in
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 1d4239a..0a62bc7 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,7 +1,7 @@
bin_SCRIPTS = viewglob
-pkglib_SCRIPTS = getopt.sh conf-to-args.sh
-pkglib_DATA = init-viewglob.bashrc .zshrc
+libexec_SCRIPTS = getopt.sh conf-to-args.sh
+pkgdata_DATA = init-viewglob.bashrc .zshrc
viewglob:
rm -f viewglob.tmp
@@ -10,27 +10,27 @@ viewglob:
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
- viewglob.in > viewglob.tmp
+ $(srcdir)/viewglob.in > viewglob.tmp
chmod a+x viewglob.tmp
mv viewglob.tmp viewglob
getopt.sh:
rm -f getopt.sh.tmp
sed -e 's,@BASH_FULL_PATH\@,$(BASH_FULL_PATH),g' \
- getopt.sh.in > getopt.sh.tmp
+ $(srcdir)/getopt.sh.in > getopt.sh.tmp
chmod a+x getopt.sh.tmp
mv getopt.sh.tmp getopt.sh
.zshrc:
rm -f init-viewglob.zshrc.tmp
sed -e 's,@pkglibdir\@,$(pkglibdir),g' \
- init-viewglob.zshrc.in > init-viewglob.zshrc.tmp
+ $(srcdir)/init-viewglob.zshrc.in > init-viewglob.zshrc.tmp
mv init-viewglob.zshrc.tmp .zshrc
init-viewglob.bashrc:
rm -f init-viewglob.bashrc.tmp
sed -e 's,@pkglibdir\@,$(pkglibdir),g' \
- init-viewglob.bashrc.in > init-viewglob.bashrc.tmp
+ $(srcdir)/init-viewglob.bashrc.in > init-viewglob.bashrc.tmp
mv init-viewglob.bashrc.tmp init-viewglob.bashrc
diff --git a/vgd/Makefile.am b/vgd/Makefile.am
index 634b7de..1982981 100644
--- a/vgd/Makefile.am
+++ b/vgd/Makefile.am
@@ -25,7 +25,7 @@ BUILT_SOURCES = vgd-usage.h
vgd-usage.h: vgd-usage.txt
rm -f vgd-usage.tmp
- sed <vgd-usage.txt >vgd-usage.tmp \
+ sed < $(srcdir)/vgd-usage.txt >vgd-usage.tmp \
-e 's/\\/\\\\/g' \
-e 's/"/\\"/g' \
-e 's/.*/\"&\\n\"/'
diff --git a/vgdisplay/Makefile.am b/vgdisplay/Makefile.am
index 4aa941b..5d2e1df 100644
--- a/vgdisplay/Makefile.am
+++ b/vgdisplay/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR) \
LDADD = \
@GLIB_LIBS@ \
@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
- @GTK_LIBS@
+ @GTK_LIBS@ -lm
-pkglib_PROGRAMS = vgclassic vgmini
+libexec_PROGRAMS = vgclassic vgmini
vgclassic_SOURCES = \
vgclassic.c \
diff --git a/vgdisplay/Makefile.in b/vgdisplay/Makefile.in
index 218587b..cd7d86d 100644
--- a/vgdisplay/Makefile.in
+++ b/vgdisplay/Makefile.in
@@ -55,7 +55,7 @@ am_vgclassic_OBJECTS = vgclassic.$(OBJEXT) exhibit.$(OBJEXT) \
hardened-io.$(OBJEXT) x11-stuff.$(OBJEXT) syslogging.$(OBJEXT) \
fgetopt.$(OBJEXT)
vgclassic_OBJECTS = $(am_vgclassic_OBJECTS)
-vgclassic_LDADD = $(LDADD)
+vgclassic_LDADD = $(LDADD) -lm
vgclassic_DEPENDENCIES =
am_vgmini_OBJECTS = vgmini.$(OBJEXT) wrap_box.$(OBJEXT) \
file_box.$(OBJEXT) lscolors.$(OBJEXT) dircont.$(OBJEXT) \
diff --git a/vgexpand/Makefile.am b/vgexpand/Makefile.am
index e6817cc..6357fc8 100644
--- a/vgexpand/Makefile.am
+++ b/vgexpand/Makefile.am
@@ -2,7 +2,7 @@ COMMON_DIR = $(top_srcdir)/common
AM_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR)
LDADD = @GLIB_LIBS@
-pkglib_PROGRAMS = vgexpand
+libexec_PROGRAMS = vgexpand
vgexpand_SOURCES = vgexpand.c
diff --git a/vgping/Makefile.am b/vgping/Makefile.am
index 02a1db3..7b09845 100644
--- a/vgping/Makefile.am
+++ b/vgping/Makefile.am
@@ -1,6 +1,6 @@
COMMON_DIR = $(top_srcdir)/common
-pkglib_PROGRAMS = vgping
+libexec_PROGRAMS = vgping
vgping_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR)
vgping_LDADD = @GLIB_LIBS@ @LIBS@
diff --git a/vgseer/Makefile.am b/vgseer/Makefile.am
index ff0431e..05480b8 100644
--- a/vgseer/Makefile.am
+++ b/vgseer/Makefile.am
@@ -29,7 +29,7 @@ BUILT_SOURCES = vgseer-usage.h
vgseer-usage.h: vgseer-usage.txt
rm -f vgseer-usage.tmp
- sed <vgseer-usage.txt >vgseer-usage.tmp \
+ sed < $(srcdir)/vgseer-usage.txt >vgseer-usage.tmp \
-e 's/\\/\\\\/g' \
-e 's/"/\\"/g' \
-e 's/.*/\"&\\n\"/'
|
