Skip to content

Commit 9999907

Browse files
committed
update Stubby + other dist tarball fixes
1 parent a1c3056 commit 9999907

4 files changed

Lines changed: 17 additions & 2 deletions

File tree

Makefile.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,14 @@ $(distdir):
213213
mkdir -p $(distdir)/src/tools
214214
mkdir -p $(distdir)/src/jsmn
215215
mkdir -p $(distdir)/src/yxml
216+
mkdir -p $(distdir)/src/ssl_dane
216217
mkdir -p $(distdir)/doc
217218
mkdir -p $(distdir)/spec
218219
mkdir -p $(distdir)/spec/example
219220
mkdir -p $(distdir)/stubby
220221
mkdir -p $(distdir)/stubby/src
221222
mkdir -p $(distdir)/stubby/src/yaml
223+
mkdir -p $(distdir)/stubby/doc
222224
cp $(srcdir)/configure.ac $(distdir)
223225
cp $(srcdir)/configure $(distdir)
224226
cp $(srcdir)/AUTHORS $(distdir)
@@ -267,12 +269,15 @@ $(distdir):
267269
cp $(srcdir)/stubby/src/yaml/*.[ch] $(distdir)/stubby/src/yaml
268270
cp $(srcdir)/stubby/COPYING $(distdir)/stubby
269271
cp $(srcdir)/stubby/README.md $(distdir)/stubby
272+
cp $(srcdir)/stubby/doc/stubby.1.in $(distdir)/stubby/doc
270273
cp $(srcdir)/src/jsmn/*.[ch] $(distdir)/src/jsmn
271274
cp $(srcdir)/src/jsmn/LICENSE $(distdir)/src/jsmn
272275
cp $(srcdir)/src/jsmn/README.md $(distdir)/src/jsmn
273276
cp $(srcdir)/src/yxml/*.[ch] $(distdir)/src/yxml
274277
cp $(srcdir)/src/yxml/COPYING $(distdir)/src/yxml
275278
cp $(srcdir)/src/yxml/yxml.pod $(distdir)/src/yxml
279+
cp $(srcdir)/src/ssl_dane/danessl.[ch] $(distdir)/src/ssl_dane
280+
cp $(srcdir)/src/ssl_dane/README.md $(distdir)/src/ssl_dane
276281
rm -f $(distdir)/Makefile $(distdir)/src/Makefile $(distdir)/src/getdns/getdns.h $(distdir)/spec/example/Makefile $(distdir)/src/test/Makefile $(distdir)/doc/Makefile $(distdir)/src/config.h
277282

278283
distcheck: $(distdir).tar.gz

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ AC_SUBST(API_VERSION, ["December 2015"])
6767
AC_SUBST(API_NUMERIC_VERSION, [0x07df0c00])
6868
GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API"
6969

70+
AC_DEFINE_UNQUOTED([STUBBY_PACKAGE], ["stubby"], [Stubby package])
71+
AC_DEFINE_UNQUOTED([STUBBY_PACKAGE_STRING], ["0.2.2$RELEASE_CANDIDATE"], [Stubby package string])
7072

7173
# Library version
7274
# ---------------

src/Makefile.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ have_libuv = @have_libuv@
4747
have_libev = @have_libev@
4848
# datarootdir is here to please some checkers
4949
datarootdir=@datarootdir@
50+
mandir=@mandir@
5051
INSTALL = @INSTALL@
5152
INSTALL_DATA = @INSTALL_DATA@
5253

@@ -205,6 +206,9 @@ getdns_query: default
205206
getdns_server_mon: default
206207
cd tools && $(MAKE) $@
207208

209+
stubby.1: $(stubbysrcdir)/doc/stubby.1.in
210+
sed -e "s|@ETCDIR@|$(stubbyconfdir)|g" $< > $@
211+
208212
stubby.lo: $(stubbysrcdir)/src/stubby.c
209213
$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(WPEDANTICFLAG) -DSTUBBYCONFDIR=\"$(sysconfdir)/stubby\" -DRUNSTATEDIR=\"$(runstatedir)\" -c $< -o $@
210214

@@ -228,14 +232,18 @@ install-stubby-files-windows: stubby.yml.windows
228232
test -f $(DESTDIR)$(stubbyconfdir)/stubby.yml || \
229233
$(INSTALL_DATA) stubby.yml.windows $(DESTDIR)$(stubbyconfdir)/stubby.yml
230234

231-
install-stubby: stubby install-stubby-files-@HOSTOS@
235+
install-stubby: stubby stubby.1 install-stubby-files-@HOSTOS@
232236
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
233237
$(LIBTOOL) --mode=install cp stubby $(DESTDIR)$(bindir)
234238
$(INSTALL) -m 755 -d $(DESTDIR)$(runstatedir)
239+
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
240+
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
241+
$(INSTALL) -m 644 stubby\.1 $(DESTDIR)$(mandir)/man1
235242

236243
uninstall-stubby:
237244
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/stubby
238245
rm -f $(DESTDIR)$(sbindir)/stubby-setdns-macos.sh
246+
rm -f $(DESTDIR)$(mandir)/man1/stubby.1
239247

240248
scratchpad: default
241249
cd test && $(MAKE) $@

0 commit comments

Comments
 (0)