aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--Makefile.conf.in44
-rw-r--r--Makefile.rules41
-rw-r--r--README15
-rw-r--r--README.options42
-rw-r--r--aclocal.m417
-rw-r--r--configure.in62
-rw-r--r--daemon/Makefile7
-rw-r--r--daemon/automount.c8
-rw-r--r--include/automount.h23
-rw-r--r--include/config.h.in19
-rw-r--r--man/Makefile5
-rw-r--r--modules/Makefile35
-rw-r--r--modules/mount_autofs.c4
-rw-r--r--modules/mount_ext2.c6
-rw-r--r--modules/mount_generic.c4
-rw-r--r--modules/mount_nfs.c4
-rw-r--r--modules/mount_smbfs.c4
-rw-r--r--releases/Makefile19
19 files changed, 276 insertions, 98 deletions
diff --git a/Makefile b/Makefile
index 6d327bd..31b6609 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ kernel:
all: daemon kernel
-clean:
+clean: configure
for i in $(SUBDIRS) kernel; do \
if [ -d $$i ]; then $(MAKE) -C $$i clean; fi; done
@@ -28,10 +28,23 @@ install_kernel:
mrproper distclean: clean
find . -noleaf \( -name '*~' -o -name '#*' -o -name '*.orig' -o -name '*.rej' -o -name '*.old' \) -print0 | xargs -0 rm -f
+ -rm -f include/config.h Makefile.conf config.*
TODAY := $(shell date +'%Y%m%d')
backup: mrproper
cd .. ; tar cf - autofs | gzip -9 > autofs-bu-$(TODAY).tar.gz
+configure: configure.in aclocal.m4
+ autoconf
+ rm -f config.*
+
+configure.in: .version
+ -rm -f .autofs-*
+ touch .autofs-`cat .version`
+ sed -e "s/(\.autofs-[0-9.]\+)/(.autofs-`cat .version`)/" < configure.in > configure.in.tmp
+ mv -f configure.in.tmp configure.in
+
-include Makefile.private
+
+
diff --git a/Makefile.conf.in b/Makefile.conf.in
new file mode 100644
index 0000000..a6f927a
--- /dev/null
+++ b/Makefile.conf.in
@@ -0,0 +1,44 @@
+# -*- makefile -*-
+#
+# Makefile.conf.in
+#
+# Pattern file to be filled in by configure; contains specific options to
+# build autofs.
+#
+
+# Special parameters for glibc (libc 6)
+LIBNSL = @LIBNSL@
+LIBRESOLV = @LIBRESOLV@
+
+# Hesiod support: yes (1) no (0)
+HESIOD = @HAVE_HESIOD@
+HESIOD_LIBS = @LIBHESIOD@
+HESIOD_FLAGS = @HESIOD_FLAGS@
+
+# NIS+ support: yes (1) no (0)
+NISPLUS = @HAVE_NISPLUS@
+
+# SMBFS support: yes (1) no (0)
+SMBFS = @HAVE_SMBMOUNT@
+
+# Support for calling e2fsck when mounting ext2 filesystems
+EXT2FS = @HAVE_E2FSCK@
+
+#
+# Note: the DESTDIR define is so you can build autofs into a temporary
+# directory and still have all the compiled-in paths point to the right
+# place.
+#
+
+# Common install prefix
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+# Directory for autofs modules
+autofslibdir = @libdir@/autofs
+
+# Where to install the automount program
+sbindir = @sbindir@
+
+# Where to install man pages
+mandir = @mandir@
diff --git a/Makefile.rules b/Makefile.rules
index d1fe66e..99c9cce 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -4,32 +4,12 @@
# Makefile rules for autofs project
#
-# -------------------------------------------------------------------------- #
-# CHECK HERE TO MAKE SURE YOU HAVE ALL THE CORRECT OPTIONS SET #
-# -------------------------------------------------------------------------- #
-
-# Special parameters for glibc.
-# If you're compiling for glibc (libc 6), uncomment these.
-#LIBNSL = -lnsl
-#LIBRESOLV = -lresolv
-
-# Uncomment these to build hesiod support. HESIOD should point to the
-# hesiod base directory.
-#HESIOD =/usr/athena
-#HESIOD_LIBS = -L$(HESIOD)/lib -lhesiod $(LIBRESOLV)
-
-# Uncomment this to build NIS+ support.
-#NISPLUS=1
-
-# -------------------------------------------------------------------------- #
-# YOU PROBABLY DON'T HAVE TO SET ANY OPTIONS BELOW THIS POINT #
-# -------------------------------------------------------------------------- #
-
# Root directory contents
SUBDIRS = daemon modules man
INCDIRS = include samples
INCFILES = COPYING COPYRIGHT NEWS README TODO Makefile Makefile.rules \
- .version
+ Makefile.conf.in .version .autofs-* configure.in aclocal.m4 \
+ configure
# Compilers, linkers and flags
# The STRIP defined here *must not* remove any dynamic-loading symbols
@@ -50,19 +30,6 @@ CXXFLAGS = $(CFLAGS)
LD = ld
SOLDFLAGS = -shared
-# Directory for autofs modules
-autofslibdir = $(DESTDIR)/usr/lib/autofs
-
-# Directory to install modules
-moddir = $(DESTDIR)/lib/modules/`uname -r`
-fsmoddir = $(moddir)/fs
-
-# Where to install the automount program
-sbindir = $(DESTDIR)/usr/sbin
-
-# Where to install man pages
-mandir = $(DESTDIR)/usr/man
-
# Kernel compilation rules (this is for "make kernel" to work; not needed
# if you're compiling the autofs kernel code as a part of the kernel itself.
# For "make kernel" to work you need the kernel code to be in the "kernel"
@@ -75,6 +42,10 @@ KINCLUDE = /usr/src/linux/include
# 3. Comment this out if you do *not* use versioned modules
MODFLAGS = -DMODVERSIONS -include $(KINCLUDE)/linux/modversions.h
+# Directory to install modules
+moddir = $(INSTALLROOT)/lib/modules/`uname -r`
+fsmoddir = $(moddir)/fs
+
# Standard rules
.SUFFIXES: .c .o .s .so
diff --git a/README b/README
index 4bd9784..135cea6 100644
--- a/README
+++ b/README
@@ -1,18 +1,21 @@
+-*- text -*-
$Id$
autofs is a kernel-based automounter for Linux. It is still under
development, although it seems to be stabilizing relatively quickly.
-To build autofs, please inspect Makefile.rules and include/automount.h
-to see if there are any options you need to change, then you can:
+To build autofs, please run:
+
+ ./configure
+
+to configure the system. See README.options for options that you can
+give configure.
+
+After configuring, you can:
make ... make the daemon and modules
make install ... install the daemon and modules
-IMPORTANT: If you are building on a glibc system, or want to build
-hesiod or NIS+ support, you *MUST* change the options at the top of
-Makefile.rules.
-
The kernel code is no longer distributed with the autofs daemon; it is
now only distributed with the kernel code. A diff is included for
kernel version 2.0.30; autofs will be included directly into 2.0.31
diff --git a/README.options b/README.options
new file mode 100644
index 0000000..38f25a0
--- /dev/null
+++ b/README.options
@@ -0,0 +1,42 @@
+-*- text -*-
+$Id$
+
+The following options can be given to configure:
+
+Install directory
+-----------------
+
+autofs usually installs in /usr, with the daemon in /usr/sbin, the man
+pages in /usr/man, and the modules in /usr/lib/autofs. You can change
+the install root with the option
+
+ --prefix=<root_prefix>
+
+For example, to install autofs under /usr/local, please specify:
+
+ ./configure --prefix=/usr/local
+
+NOTICE TO DISTRIBUTORS: Don't use this option if you want to install
+autofs in a temporary directory that isn't the final destination (for
+example, if you are making an autofs package for a distribution.)
+Instead, you can do
+
+ make install INSTALLROOT=/tmp/install
+
+... which will install all files relative to /tmp/install.
+
+Hesiod support
+--------------
+
+To enable Hesiod support, if your Hesiod library isn't installed in
+/usr/lib with the include files in /usr/include, please specify the
+option:
+
+ --with-hesiod=<hesiod_root>
+
+For example, if your Hesiod library lives in /usr/athena/lib and the
+include files in /usr/athena/include, please specify:
+
+ ./configure --with-hesiod=/usr/athena
+
+
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..0a2a0fc
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,17 @@
+dnl $Id$
+
+dnl --------------------------------------------------------------------------
+dnl AF_PATH_INCLUDE:
+dnl
+dnl Like AC_PATH_PROGS, but add to the .h file as well
+dnl --------------------------------------------------------------------------
+AC_DEFUN(AF_PATH_INCLUDE,
+[AC_PATH_PROGS($1,$2)
+if test -n "$$1"; then
+ AC_DEFINE(HAVE_$1)
+ AC_DEFINE_UNQUOTED(PATH_$1, "$$1")
+ HAVE_$1=1
+else
+ HAVE_$1=0
+fi
+AC_SUBST(HAVE_$1)])
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..b910389
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,62 @@
+# $Id$
+# configure.in for the autofs daemon
+
+AC_INIT(.autofs-0.3.15)
+
+#
+# autofs installs by default in /usr
+#
+AC_PREFIX_DEFAULT(/usr)
+
+#
+# Programs needed for various system functions or modules
+#
+AF_PATH_INCLUDE(MOUNT, mount, /bin/mount, $PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/etc:/usr/etc)
+AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/etc:/usr/etc)
+AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/etc:/usr/etc)
+AF_PATH_INCLUDE(SMBMOUNT, smbmount, , $PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/etc:/usr/etc)
+AC_SUBST(HAVE_SMBMOUNT)
+
+#
+# glibc/libc 6 new libraries
+#
+AC_CHECK_LIB(nsl, yp_match, LIBNSL="-lnsl")
+AC_SUBST(LIBNSL)
+
+AC_CHECK_LIB(resolv, res_query, LIBRESOLV="-lresolv")
+AC_SUBST(LIBRESOLV)
+
+#
+# Hesiod support? Hesiod is tricky, because it may live in /usr/athena
+# or some equally weird place; if so, have the user specify
+# --with-hesiod=/usr/athena
+#
+AF_tmp_ldflags="$LDFLAGS"
+AC_ARG_WITH(hesiod, enable Hesiod support,
+ if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"
+ then
+ LIBHESIOD=""
+ else
+ LDFLAGS="$LDFLAGS -L$withval"
+ LIBHESIOD="-L${withval}/lib"
+ HESIOD_FLAGS="-I${withval}/include"
+ fi
+)
+
+HAVE_HESIOD=0
+AC_CHECK_LIB(hesiod, hes_resolve, HAVE_HESIOD=1 LIBHESIOD="$LIBHESIOD -lhesiod")
+AC_SUBST(HAVE_HESIOD)
+AC_SUBST(LIBHESIOD)
+AC_SUBST(HESIOD_FLAGS)
+
+# NIS+ support?
+HAVE_NISPLUS=0
+AC_CHECK_HEADER(rpcsvc/nis.h, HAVE_NISPLUS=1)
+AC_SUBST(HAVE_NISPLUS)
+
+#
+# Write Makefile.conf and include/config.h
+#
+AC_CONFIG_HEADER(include/config.h)
+AC_OUTPUT(Makefile.conf)
+
diff --git a/daemon/Makefile b/daemon/Makefile
index c605261..6bb89b9 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -3,11 +3,12 @@
# Makefile for autofs
#
+include ../Makefile.conf
+include ../Makefile.rules
+
SRCS = automount.c spawn.c module.c mount.c
OBJS = automount.o spawn.o module.o mount.o
-include ../Makefile.rules
-
version := $(shell cat ../.version)
CFLAGS += -rdynamic -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -DVERSION_STRING=\"$(version)\" -I../include
@@ -24,6 +25,6 @@ clean:
rm -f *.o *.s automount
install: all
- install -c automount -m 755 -o root $(sbindir)
+ install -c automount -m 755 $(INSTALLROOT)$(sbindir)
diff --git a/daemon/automount.c b/daemon/automount.c
index f51b8dc..35b53ea 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -87,8 +87,8 @@ static int umount_ent(char *root, char *name)
if ( !lstat(path_buf,&st) ) {
if ( S_ISDIR(st.st_mode) ) {
if ( st.st_dev != ap.dev ) {
- rv = spawnl(LOG_NOTICE, _PATH_UMOUNT,
- _PATH_UMOUNT, path_buf, NULL);
+ rv = spawnl(LOG_DEBUG, PATH_UMOUNT,
+ PATH_UMOUNT, path_buf, NULL);
if ( !rv )
rmdir(path_buf);
} else
@@ -146,7 +146,7 @@ static int do_umount_autofs(void)
}
if (ap.pipefd >= 0)
close(ap.pipefd);
- rv = spawnl(LOG_ERR, _PATH_UMOUNT, _PATH_UMOUNT, ap.path, NULL);
+ rv = spawnl(LOG_ERR, PATH_UMOUNT, PATH_UMOUNT, ap.path, NULL);
if (rv == 0 && submount)
rmdir(ap.path);
@@ -240,7 +240,7 @@ static int mount_autofs(char *path)
(unsigned)my_pgrp, AUTOFS_PROTO_VERSION);
sprintf(our_name, "automount(pid%u)", (unsigned)my_pid);
- if ( spawnl(LOG_CRIT, _PATH_MOUNT, _PATH_MOUNT, "-t", "autofs", "-o",
+ if ( spawnl(LOG_CRIT, PATH_MOUNT, PATH_MOUNT, "-t", "autofs", "-o",
options, our_name, path, NULL) ) {
close(pipefd[0]);
close(pipefd[1]);
diff --git a/include/automount.h b/include/automount.h
index 14f13c5..d3899ef 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -10,26 +10,15 @@
#define AUTOMOUNT_H
#include <paths.h>
+#include "config.h"
-#ifndef _PATH_MOUNT
-#define _PATH_MOUNT "/bin/mount"
+/* We MUST have the paths to mount(8) and umount(8) */
+#ifndef HAVE_MOUNT
+#error Failed to locate mount(8)!
#endif
-#ifndef _PATH_UMOUNT
-#define _PATH_UMOUNT "/bin/umount"
-#endif
-#ifndef _PATH_AUTOMOUNT
-#define _PATH_AUTOMOUNT "/usr/sbin/automount"
-#endif
-
-#ifndef _PATH_E2FSCK
-#define _PATH_E2FSCK "/sbin/fsck.ext2"
-#endif
-
-/* If smbmount is unavailable, remove the mount_smbfs module from
- modules/Makefile */
-#ifndef _PATH_SMBMOUNT
-#define _PATH_SMBMOUNT "/usr/bin/smbmount"
+#ifndef HAVE_UMOUNT
+#error Failed to locate umount(8)!
#endif
/* Standard function used by daemon or modules */
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 0000000..70ce165
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,19 @@
+/* -*- c -*-
+ *
+ * config.h.in: Pattern file for autofs to be filled in by configure
+ *
+ */
+
+/* Program paths */
+#undef HAVE_MOUNT
+#undef PATH_MOUNT
+
+#undef HAVE_UMOUNT
+#undef PATH_UMOUNT
+
+#undef HAVE_SMBMOUNT
+#undef PATH_SMBMOUNT
+
+#undef HAVE_E2FSCK
+#undef PATH_E2FSCK
+
diff --git a/man/Makefile b/man/Makefile
index ae958c0..328f3a4 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,10 +1,11 @@
# $Id$
+include ../Makefile.conf
include ../Makefile.rules
install:
- install -c *.5 -m 644 $(mandir)/man5
- install -c *.8 -m 644 $(mandir)/man8
+ install -c *.5 -m 644 $(INSTALLROOT)$(mandir)/man5
+ install -c *.8 -m 644 $(INSTALLROOT)$(mandir)/man8
all:
diff --git a/modules/Makefile b/modules/Makefile
index 7d6634c..3c1ddc8 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -3,29 +3,38 @@
# Makefile for autofs
#
+include ../Makefile.conf
include ../Makefile.rules
-SRCS = lookup_yp.c lookup_file.c lookup_program.c \
+SRCS := lookup_yp.c lookup_file.c lookup_program.c \
parse_sun.c \
- mount_generic.c mount_ext2.c mount_nfs.c mount_smbfs.c \
- mount_afs.c mount_autofs.c
+ mount_generic.c mount_nfs.c mount_afs.c mount_autofs.c
-MODS = lookup_yp.so lookup_file.so lookup_program.so \
+MODS := lookup_yp.so lookup_file.so lookup_program.so \
parse_sun.so \
- mount_generic.so mount_ext2.so mount_nfs.so mount_smbfs.so \
- mount_afs.so mount_autofs.so
+ mount_generic.so mount_nfs.so mount_afs.so mount_autofs.so
-ifdef HESIOD
+ifeq ($(EXT2FS), 1)
+ SRCS += mount_ext2.c
+ MODS += mount_ext2.so
+endif
+
+ifeq ($(SMBFS), 1)
+ SRCS += mount_smbfs.c
+ MODS += mount_smbfs.so
+endif
+
+ifeq ($(HESIOD), 1)
SRCS += lookup_hesiod.c parse_hesiod.c
MODS += lookup_hesiod.so parse_hesiod.so
endif
-ifdef NISPLUS
+ifeq ($(NISPLUS), 1)
SRCS += lookup_nisplus.c
MODS += lookup_nisplus.so
endif
-CFLAGS += -I../include -fpic -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
+CFLAGS += -I../include -fpic -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -DPATH_AUTOMOUNT=\"$(sbindir)/automount\"
all: $(MODS)
@@ -33,8 +42,8 @@ clean:
rm -f *.o *.s *.so
install: all
- install -d -m 755 $(autofslibdir)
- install -c $(MODS) -m 644 -o root $(autofslibdir)
+ install -d -m 755 $(INSTALLROOT)$(autofslibdir)
+ install -c $(MODS) -m 644 $(INSTALLROOT)$(autofslibdir)
#
# Ad hoc compilation rules for modules which need auxilliary libraries
@@ -49,6 +58,6 @@ lookup_nisplus.so: lookup_nisplus.c
$(STRIP) lookup_nisplus.so
lookup_hesiod.so: lookup_hesiod.c
- $(CC) $(SOLDFLAGS) $(CFLAGS) -I$(HESIOD)/include -o lookup_hesiod.so \
- lookup_hesiod.c $(HESIOD_LIBS)
+ $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
+ lookup_hesiod.c $(LIBHESIOD)
$(STRIP) lookup_hesiod.so
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index ed9f2e9..239fa73 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -76,7 +76,7 @@ int mount_mount(const char *root, const char *name, int name_len,
argv = (char **) alloca((argc+1) * sizeof(char *));
argc = 0;
- argv[argc++] = _PATH_AUTOMOUNT;
+ argv[argc++] = PATH_AUTOMOUNT;
argv[argc++] = "--submount";
argv[argc++] = fullpath;
argv[argc++] = strcpy(alloca(strlen(what)+1), what);
@@ -104,7 +104,7 @@ int mount_mount(const char *root, const char *name, int name_len,
goto error;
} else if ( slave == 0 ) {
/* Slave process */
- execv(_PATH_AUTOMOUNT, argv);
+ execv(PATH_AUTOMOUNT, argv);
_exit(255);
}
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index dec22d5..7b4e643 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -58,7 +58,7 @@ int mount_mount(const char *root, const char *name, int name_len,
}
syslog(LOG_DEBUG, MODPREFIX "calling fsck.ext2 -p %s", what);
- err = spawnl(LOG_DEBUG, _PATH_E2FSCK, _PATH_E2FSCK, "-p", what, NULL);
+ err = spawnl(LOG_DEBUG, PATH_E2FSCK, PATH_E2FSCK, "-p", what, NULL);
if ( err & ~7 ) {
syslog(LOG_ERR, MODPREFIX "%s: filesystem needs repair, won't mount",
what);
@@ -68,12 +68,12 @@ int mount_mount(const char *root, const char *name, int name_len,
if ( options ) {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t %s -o %s %s %s",
fstype, options, what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", fstype,
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", fstype,
"-o", options, what, fullpath, NULL);
} else {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t %s %s %s",
fstype, what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", fstype,
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", fstype,
what, fullpath, NULL);
}
if ( err ) {
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 0c46805..8b7ce41 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -60,12 +60,12 @@ int mount_mount(const char *root, const char *name, int name_len,
if ( options ) {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t %s -o %s %s %s",
fstype, options, what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", fstype,
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", fstype,
"-o", options, what, fullpath, NULL);
} else {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t %s %s %s",
fstype, what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", fstype,
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", fstype,
what, fullpath, NULL);
}
if ( err ) {
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index c64af9e..a556841 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -147,11 +147,11 @@ int mount_mount(const char *root, const char *name, int name_len,
if ( options ) {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t nfs -o %s %s %s",
options, what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", "nfs", "-o",
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", "nfs", "-o",
options, what, fullpath, NULL);
} else {
syslog(LOG_DEBUG, MODPREFIX "calling mount -t nfs %s %s", what, fullpath);
- err = spawnl(LOG_NOTICE, _PATH_MOUNT, _PATH_MOUNT, "-t", "nfs",
+ err = spawnl(LOG_NOTICE, PATH_MOUNT, PATH_MOUNT, "-t", "nfs",
what, fullpath, NULL);
}
if ( err ) {
diff --git a/modules/mount_smbfs.c b/modules/mount_smbfs.c
index 7aec92d..811fe8d 100644
--- a/modules/mount_smbfs.c
+++ b/modules/mount_smbfs.c
@@ -151,7 +151,7 @@ int mount_mount(const char *root, const char *name, int name_len,
syslog(LOG_ERR, MODPREFIX "alloca: %m");
return 1;
}
- argv[0] = _PATH_SMBMOUNT;
+ argv[0] = PATH_SMBMOUNT;
argv[1] = what;
argv[2] = fullpath;
memcpy(optcopy, options, optsize);
@@ -163,7 +163,7 @@ int mount_mount(const char *root, const char *name, int name_len,
return 1;
}
- err = spawnv(LOG_NOTICE, _PATH_SMBMOUNT, argv);
+ err = spawnv(LOG_NOTICE, PATH_SMBMOUNT, argv);
if ( err ) {
rmdir(fullpath);
diff --git a/releases/Makefile b/releases/Makefile
index eb4ef06..aafa00f 100644
--- a/releases/Makefile
+++ b/releases/Makefile
@@ -33,16 +33,23 @@ since:
echo '' >> ../NEWS
cat ../NEWS.old >> ../NEWS
-newrelease: clean since
- echo `cut -d. -f1-2 < .version`.`expr \`cut -d. -f3 < .version\` + 1` \
+newrelease: since
+ echo `cut -d. -f1-2 < ../.version`.`expr \`cut -d. -f3 < ../.version\` + 1` \
> ../.version
+ $(MAKE) clean
-newminorrelease: clean since
- echo `cut -d. -f1 < .version`.`expr \`cut -d. -f2 < .version\` + 1`.0 \
+newminorrelease: since
+ echo `cut -d. -f1 < ../.version`.`expr \`cut -d. -f2 < ../.version\` + 1`.0 \
> ../.version
+ $(MAKE) clean
-newmajorrelease: clean since
- echo `expr \`cut -d. -f1 < .version\` + 1`.0.0 > ../.version
+newmajorrelease: since
+ echo `expr \`cut -d. -f1 < ../.version\` + 1`.0.0 > ../.version
+ $(MAKE) clean
+
+# Note: "clean" includes autoconf stuff
+clean:
+ make -C .. clean
upload: release
scp autofs-$(RELEASE).tar.gz $(REPOSITORY)