diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-06-30 11:28:02 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-06-30 11:28:02 +0200 |
| commit | 8b264b41e57dc9776279f7a88f9792a15e0f211a (patch) | |
| tree | ec0b135d257d4dc8a820c0cf891163f2ca4bb483 | |
| parent | dd1d4b33c086fb13a27ee30b253adee88614f780 (diff) | |
use $(srcdir) instead of $(abs_srcdir) in Makefile.am, so makedist works again
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77484de..7c51609 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ build: - autoreconf -fi - ./configure --enable-option-checking=fatal --prefix=/ - make install CFLAGS='-Werror' DESTDIR="$(realpath ./deploy/gcc)" V=s + - make dist + - cp ptunnel-ng-*.tar.gz ./deploy/ stage: build artifacts: paths: diff --git a/src/Makefile.am b/src/Makefile.am index b39d89e..552c894 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,9 +36,9 @@ ptunnel_ng_SOURCES = \ ptunnel.c if IS_WINDOWS -wpcap_DEF = $(abs_srcdir)/win32/WPCAP.DEF -wpcap_IMP = $(abs_srcdir)/win32/libwpcap_implib.a -ptunnel_ng_CFLAGS += -I$(abs_srcdir)/win32/includes -DHAVE_PCAP=1 +wpcap_DEF = $(srcdir)/win32/WPCAP.DEF +wpcap_IMP = $(srcdir)/win32/libwpcap_implib.a +ptunnel_ng_CFLAGS += -I$(srcdir)/win32/includes -DHAVE_PCAP=1 if HAVE_NPCAP ptunnel_ng_CFLAGS += -DHAVE_NPCAP=1 endif |