From d232353f93f1d1780b455ff55e670cbfda4cea06 Mon Sep 17 00:00:00 2001 From: Sara Dickinson Date: Wed, 13 Dec 2017 14:22:52 +0000 Subject: [PATCH] Update makefile because a file in Stubby was moved --- Makefile.in | 2 +- src/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1096dc3b..63216493 100644 --- a/Makefile.in +++ b/Makefile.in @@ -253,7 +253,7 @@ $(distdir): cp $(srcdir)/src/tools/Makefile.in $(distdir)/src/tools cp $(srcdir)/src/tools/*.[ch] $(distdir)/src/tools cp $(srcdir)/stubby/stubby.yml.example $(distdir)/stubby - cp $(srcdir)/stubby/stubby-setdns-macos.sh $(distdir)/stubby + cp $(srcdir)/stubby/macos/stubby-setdns-macos.sh $(distdir)/stubby cp $(srcdir)/stubby/src/*.[ch] $(distdir)/stubby/src cp $(srcdir)/stubby/src/yaml/*.[ch] $(distdir)/stubby/src/yaml cp $(srcdir)/stubby/COPYING $(distdir)/stubby diff --git a/src/Makefile.in b/src/Makefile.in index a84dbf16..b37d296e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -208,9 +208,9 @@ install-stubby-files-unix: $(stubbysrcdir)/stubby.yml.example test -f $(DESTDIR)$(stubbyconfdir)/stubby.yml || \ $(INSTALL_DATA) $(stubbysrcdir)/stubby.yml.example $(DESTDIR)$(stubbyconfdir)/stubby.yml -install-stubby-files-macos: $(stubbysrcdir)/stubby-setdns-macos.sh install-stubby-files-unix +install-stubby-files-macos: $(stubbysrcdir)/macos/stubby-setdns-macos.sh install-stubby-files-unix $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir) - $(INSTALL) -m 755 $(stubbysrcdir)/stubby-setdns-macos.sh $(DESTDIR)$(sbindir) + $(INSTALL) -m 755 $(stubbysrcdir)/macos/stubby-setdns-macos.sh $(DESTDIR)$(sbindir) stubby.yml.windows: $(stubbysrcdir)/stubby.yml.example awk "{sub(/$$/,\"\r\")}1" $(stubbysrcdir)/stubby.yml.example > stubby.yml.windows