Permalink
Browse files

make distcheck work

  • Loading branch information...
hfiguiere committed Dec 14, 2016
1 parent b6f1787 commit 40f9512d33d1ff303f38ae72f2df23b8877836a1
Showing with 8 additions and 6 deletions.
  1. +5 −3 Makefile.am
  2. +3 −3 configure.ac
View
@@ -12,6 +12,7 @@ ui_files = src/mgwindow.ui \
$(null)
EXTRA_DIST = Cargo.toml \
Cargo.lock \
src/devices.json \
src/devices.rs \
src/drivers.rs \
@@ -38,14 +39,14 @@ update-icon-cache:
fi
all-local:
cargo build --release
(cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build --release)
clean-local:
-cargo clean
-(cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo clean)
install-exec-local:
$(MKDIR_P) $(DESTDIR)$(bindir)
$(INSTALL) -c -m 755 target/@CARGO_TARGET_DIR@/gpsami $(DESTDIR)$(bindir)
$(INSTALL) -c -m 755 target/@CARGO_TARGET_SUBDIR@/gpsami $(DESTDIR)$(bindir)
uninstall-local:
rm $(DESTDIR)$(bindir)/gpsami
@@ -55,4 +56,5 @@ DISTCLEANFILES = \
$(null)
check:
(cd $(top_srcdir) ; CARGO_TARGET_DIR=@abs_top_builddir@/target cargo test --release)
desktop-file-validate $(desktop_files)
View
@@ -1,7 +1,7 @@
AC_INIT([gpsami], m4_esyscmd([grep ^version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n"]), [hub@figuiere.net])
AM_INIT_AUTOMAKE([1.11 foreign no-dependencies no-dist-gzip dist-xz subdir-objects])
VERSION=$(grep ^version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
VERSION=$(grep ^version $srcdir/Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
AC_CHECK_PROG(CARGO, [cargo], [yes], [no])
AS_IF(test x$CARGO = xno,
@@ -13,8 +13,8 @@ AS_IF(test x$RUSTC = xno,
)
dnl Release build we do.
CARGO_TARGET_DIR=release
AC_SUBST(CARGO_TARGET_DIR)
CARGO_TARGET_SUBDIR=release
AC_SUBST(CARGO_TARGET_SUBDIR)
AC_SUBST(VERSION)

0 comments on commit 40f9512

Please sign in to comment.