Remove the configuration and installation of the old language files.

Make the installation of the po files functional.

diff --git a/Makefile.in b/Makefile.in
index e7984ac4e46324216b45858cbb88e7317e357e19..d481fb98405066ea3f577e7e1b34a1ea0dc75927 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ prefix=@prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 exec_prefix=@exec_prefix@
+localedir   = $(datadir)/locale
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 docdir      = @docdir@
 CC          = @CC@
@@ -11,21 +12,18 @@ BINDIR      = @bindir@
 MANDIR      = @mandir@
 SYSCONFDIR  = @sysconfdir@
 SARGPHPDIR  = @SARGPHPDIR@
-LANGDIR     = @LANGDIR@
 FONTDIR     = @FONTDIR@
 IMAGEDIR    = @IMAGEDIR@
-LOCALEDIR   = $(datadir)/locale
 IBINDIR     = -DBINDIR=\"@bindir@\"
 ISYSCONFDIR = -DSYSCONFDIR=\"@sysconfdir@\"
 ISARGPHPDIR = -DSARGPHPDIR=\"@SARGPHPDIR@\"
-ILANGDIR    = -DLANGDIR=\"@LANGDIR@\"
 IFONTDIR    = -DFONTDIR=\"@FONTDIR@\"
 IIMAGEDIR   = -DIMAGEDIR=\"@IMAGEDIR@\"
 ILOCALEDIR  = -DLOCALEDIR=\"$(localedir)\"
 CFLAGS      = @CFLAGS@
 CPPFLAGS    = @CPPFLAGS@
 LDFLAGS     = @LDFLAGS@
-DEFS        = $(IBINDIR) $(ISYSCONFDIR) $(ILANGDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@
+DEFS        = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@
 LIBS        = @LIBS@
 SRCDIR      = .
 VPATH       = .
@@ -47,7 +45,7 @@ OBJS = $(patsubst %.c,%.o,$(SRCS))
 DISTFILES = $(SRCS) ABOUT-NLS
 
 SUBDIRS = po
-.PHONY: install clean uninstall mostlyclean distclean $(SUBDIRS)
+.PHONY: all install clean uninstall mostlyclean distclean update-po $(SUBDIRS)
 
 all: sarg
 
@@ -60,7 +58,7 @@ sarg: $(OBJS)
 $(SUBDIRS):
        $(MAKE) -C $@
 
-install: all po
+install: all install-po
        -@if test ! -d $(DESTDIR)$(BINDIR); then \
                echo "creating $(DESTDIR)$(BINDIR)"; \
                mkdir -p $(DESTDIR)$(BINDIR); \
@@ -73,10 +71,6 @@ install: all po
                echo "creating $(DESTDIR)$(SYSCONFDIR)"; \
                mkdir -p $(DESTDIR)$(SYSCONFDIR); \
        fi
-       -@if test ! -d $(DESTDIR)$(LANGDIR); then \
-               echo "Creating $(DESTDIR)$(LANGDIR)"; \
-               mkdir -p $(DESTDIR)$(LANGDIR); \
-       fi
        -@if test ! -d $(DESTDIR)$(IMAGEDIR); then \
                echo "Creating $(DESTDIR)$(IMAGEDIR)"; \
                mkdir -p $(DESTDIR)$(IMAGEDIR); \
@@ -91,7 +85,6 @@ install: all po
        else \
                cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf.default; \
        fi
-       cp -r ./languages/* $(DESTDIR)$(LANGDIR);
        cp ./exclude_codes $(DESTDIR)$(SYSCONFDIR);
        cp ./user_limit_block $(DESTDIR)$(SYSCONFDIR);
        cp -r ./images/* $(DESTDIR)$(IMAGEDIR);
@@ -107,14 +100,14 @@ install: all po
                cp -r ./sarg-php $(DESTDIR)$(SARGPHPDIR); \
        fi
 
-uninstall: po
+uninstall: uninstall-po
        rm -f $(DESTDIR)$(BINDIR)/sarg
        rm -f $(DESTDIR)$(MANDIR)/sarg.1
 
 TAGS: $(SRCS)
        etags $(SRCS)
 
-clean: po
+clean: clean-po
        rm -f sarg *.o core
 
 mostlyclean: clean
@@ -125,5 +118,14 @@ distclean: clean
 realclean: distclean
        rm -f TAGS
 
+install-po:
+       $(MAKE) -C po install
+
+uninstall-po:
+       $(MAKE) -C po uninstall
+
+clean-po:
+       $(MAKE) -C po clean
+
 update-po:
        $(MAKE) -C po update-po

diff --git a/configure.in b/configure.in
index 16dafdcd9e38d2042eae2d9bfce012a41bc11576..0d96e1ea0b4f6c1035d549db83fb803203caa03e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -152,23 +152,6 @@ if test "$SARGPHPDIR" ; then
    AC_SUBST(SARGPHPDIR)
 fi
 
-dnl Select languages dir
-AC_ARG_ENABLE(languagedir,
-[  --enable-languagedir=languagedir
-                        Select languagedir as the directory with the translations of sarg ],
-[
-    if test "$enableval"; then
-        LANGDIR=$enableval
-    fi
-],[LANGDIR="${datarootdir}/sarg/languages"])
-if test "x$prefix" == "xNONE" ; then
-   tempfullpath=`prefix=$ac_default_prefix ; eval "echo $LANGDIR"`
-else
-   tempfullpath=`eval "echo $LANGDIR"`
-fi
-echo "using $tempfullpath as the directory of the translations"
-AC_SUBST(LANGDIR)
-
 dnl Select fonts dir
 AC_ARG_ENABLE(fontdir,
 [  --enable-fontdir=fontdir