configure.in: VERSION file is in $srcdir, need when configured with

../netatalk/configure. I'm not sure $srcdir is the right variable.

bin/afppasswd/Makefile.am: don't chmod afppasswd if it's not built.

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index 1d26736607f90bad0785827a556cb129229d02a5..b9fad222a1e4d4f76243de6e9203b4d8df8c12f3 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -15,4 +15,6 @@ CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
     -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
+if USE_DHX
        chmod u+s $(DESTDIR)$(bindir)/afppasswd
+endif
\ No newline at end of file

diff --git a/configure.in b/configure.in
index 9764e236828577726ec95f02a88dee6b021bad48..3b028ad8e85ca4ce9f06c764a370904156d57e1a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
-dnl $Id: configure.in,v 1.158 2002-05-29 18:02:57 jmarcus Exp $
+dnl $Id: configure.in,v 1.159 2002-06-11 17:21:10 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
 
-NETATALK_VERSION=`cat VERSION`
+NETATALK_VERSION=`cat $srcdir/VERSION`
 AC_SUBST(NETATALK_VERSION)
 
 AC_CANONICAL_SYSTEM