Imported Upstream version 2.6.1

[debian/amanda] / oldrecover-src / Makefile.am

diff --git a/oldrecover-src/Makefile.am b/oldrecover-src/Makefile.am
index 8a0472d4b3af50c8ed01d3d4eaa9fd02008d8883..77c7fa86db1b5c81b2d3b9634cc911e1b81722ab 100644 (file)
--- a/oldrecover-src/Makefile.am
+++ b/oldrecover-src/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile for Amanda file recovery programs.
 
+include $(top_srcdir)/config/automake/vars.am
 include $(top_srcdir)/config/automake/installperms.am
 include $(top_srcdir)/config/automake/precompile.am
 
@@ -11,8 +12,8 @@ INCLUDES =    -I$(top_builddir)/common-src \
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
 AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
 LIB_EXTENSION = la
 
@@ -29,8 +30,7 @@ LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
        @LEXLIB@ \
        $(READLINE_LIBS) \
        ../client-src/libamclient.$(LIB_EXTENSION) \
-       ../common-src/libamanda.$(LIB_EXTENSION) \
-       ../gnulib/libgnu.$(LIB_EXTENSION)
+       ../common-src/libamanda.$(LIB_EXTENSION)
 
 amoldrecover_CSRC =    amrecover.c                                     \
                        display_commands.c              extract_list.c  \
@@ -56,7 +56,7 @@ uparse.$(OBJEXT): uparse.c
 
 
 INSTALLPERMS_exec = \
-       dest=$(sbindir) chown=amanda chmod=o-rwx $(sbin_PROGRAMS)
+       dest=$(sbindir) chown=amanda chmod=0750 $(sbin_PROGRAMS)
 
 lint:
        @ f="$(amoldrecover_CSRC)";                                             \