[PATCH 1/3] Enable sc_makefile_at_at_check; fix problems it identifies.

[James Youngman]

* lib/Makefile.am: Use $(FINDLIBOBJS) instead of @address@hidden
* find/Makefile.am (LDADD): Use $(FINDLIBS) instead of @address@hidden
* locate/Makefile.am (updatedb): Use $(VERSION) and
$(PACKAGE_NAME) instead of @VERSION@ and @address@hidden
* cfg.mk: remove sc_makefile_at_at_check from local-checks-to-skip
---
 ChangeLog          |    9 +++++++++
 cfg.mk             |    3 ---
 find/Makefile.am   |    2 +-
 lib/Makefile.am    |    8 ++------
 locate/Makefile.am |    4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da82f8d..52104b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-06-12  James Youngman  <address@hidden>
 
+       Enable sc_makefile_at_at_check; fix problems it identifies.
+       * lib/Makefile.am: Use $(FINDLIBOBJS) instead of @address@hidden
+       * find/Makefile.am (LDADD): Use $(FINDLIBS) instead of @address@hidden
+       * locate/Makefile.am (updatedb): Use $(VERSION) and
+       $(PACKAGE_NAME) instead of @VERSION@ and @address@hidden
+       * cfg.mk: remove sc_makefile_at_at_check from local-checks-to-skip
+
+2011-06-12  James Youngman  <address@hidden>
+
        Improve src-sniff.py.
 
        * build-aux/src-sniff.py: Mention that many of these checks would
diff --git a/cfg.mk b/cfg.mk
index b3bb230..5244106 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -20,9 +20,6 @@ local-checks-to-skip :=
 local-checks-to-skip += sc_error_message_period sc_error_message_uppercase \
        sc_file_system
 
-# Errors I have not investigated; diagnose and fix later.
-local-checks-to-skip += sc_makefile_at_at_check
-
 exclude_file_name_regexp--sc_obsolete_symbols = build-aux/src-sniff\.py
 exclude_file_name_regexp--sc_space_tab = \
        xargs/testsuite/(inputs/.*\.xi|xargs.(gnu|posix|sysv)/.*\.xo)$$
diff --git a/find/Makefile.am b/find/Makefile.am
index dce8bc5..ba18731 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -31,7 +31,7 @@ endif
 # man_MANS is not always the same, we want to distribute all of those files.
 EXTRA_DIST = defs.h sharefile.h find.1 ftsfind.1 oldfind.1
 INCLUDES = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl 
-DLOCALEDIR=\"$(localedir)\"
-LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) 
$(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) 
@FINDLIBS@
+LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) 
$(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) 
$(FINDLIBS)
 SUBDIRS = . testsuite
 
 #$(PROGRAMS): ../lib/libfind.a
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9aa578e..f8ff625 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,12 +40,8 @@ libfind_a_SOURCES += listfile.c nextelem.c extendbuf.c 
buildcmd.c savedirinfo.c
 
 EXTRA_DIST += waitpid.c forcefindlib.c
 TESTS_ENVIRONMENT = REGEXPROPS=regexprops$(EXEEXT)
-libfind_a_LIBADD = @FINDLIBOBJS@
-libfind_a_DEPENDENCIES = @FINDLIBOBJS@
-# libfind_la_LIBADD = @LTFINDLIBOBJS@
-
-# libfind_a_OBJECTS  += @FINDLIBOBJS@
-# libfind_la_OBJECTS += @LTFINDLIBOBJS@
+libfind_a_LIBADD = $(FINDLIBOBJS)
+libfind_a_DEPENDENCIES = $(FINDLIBOBJS)
 
 check-regexprops: check-regexprops.sh
        cp  $(srcdir)/check-regexprops.sh check-regexprops
diff --git a/locate/Makefile.am b/locate/Makefile.am
index f8b71fb..954a696 100644
--- a/locate/Makefile.am
+++ b/locate/Makefile.am
@@ -39,8 +39,8 @@ updatedb: updatedb.sh Makefile
        -e "s,@""bindir""@,$(bindir)," \
        -e "s,@""libexecdir""@,$(libexecdir)," \
        -e "s,@""LOCATE_DB""@,$(LOCATE_DB)," \
-       -e "s,@""VERSION""@,@VERSION@," \
-       -e "s,@""PACKAGE_NAME""@,@PACKAGE_NAME@," \
+       -e "s,@""VERSION""@,$(VERSION)," \
+       -e "s,@""PACKAGE_NAME""@,$(PACKAGE_NAME)," \
        -e "s,@""find""@,$${find}," \
        -e "s,@""frcode""@,$${frcode}," \
        -e "s,@""bigram""@,$${bigram}," \
-- 
1.7.2.5