--- jwm-git-4640d3b48.old/Makefile.in +++ jwm-git-4640d3b48/Makefile.in @@ -7,11 +7,9 @@ all: $(MAKE) -C src all - $(MAKE) -C po all install: all $(MAKE) -C src install - $(MAKE) -C po install $(MAKE) -C contrib install install -d -m 0755 $(SYSCONF) install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc @@ -20,7 +18,6 @@ install-strip: all install-conf $(MAKE) -C src install-strip - $(MAKE) -C po install-strip $(MAKE) -C contrib install install -d -m 0755 $(SYSCONF) install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc @@ -30,7 +27,6 @@ uninstall: $(MAKE) -C src uninstall - $(MAKE) -C po uninstall $(MAKE) -C contrib uninstall rm -f $(SYSCONF)/system.jwmrc rm -f $(MANDIR)/man1/jwm.1 @@ -46,7 +42,6 @@ clean: (cd src && $(MAKE) clean) - (cd po && $(MAKE) clean) rm -rf doc distclean: clean @@ -55,33 +50,3 @@ rm -fr autom4te.cache rm -f Makefile.bak src/Makefile.bak rm -fr .git .gitignore - -check-gettext: - @if test x$(USE_NLS) != "xyes" ; then \ - echo "Missing gettext. Rerun configure and check for" \ - "'checking whether to use NLS... yes'!" ; exit 1 ; fi - -update-po: check-gettext - @find src/ -name "*.c" -print | sort > po/POTFILES.in.2 ; \ - if diff po/POTFILES.in po/POTFILES.in.2 >/dev/null 2>&1 ; then \ - rm -f po/POTFILES.in.2 ; \ - else \ - mv po/POTFILES.in.2 po/POTFILES.in ; \ - fi - cd po && $(MAKE) $(AM_MAKEFLAGS) update-po - -update-gmo: check-gettext - cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo - -force-update-gmo: check-gettext - touch po/*.po - cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo - -force-update-gmo-%: check-gettext - @language=`echo $@ | sed s/force-update-gmo-//` ; \ - if test ! -f po/$$language.po ; then \ - echo "file po/$$language.po does not exist" ; exit 1 ; fi ; \ - touch po/$$language.po ; \ - cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo - -.PHONY: check-gettext update-po update-gmo force-update-gmo --- jwm-git-4640d3b48.old/configure.ac +++ jwm-git-4640d3b48/configure.ac @@ -5,7 +5,6 @@ AC_INIT([jwm],[2.4.4],[joewing@joewing.net]) AC_PREREQ([2.69]) AC_CONFIG_SRCDIR([src]) -AC_CONFIG_SRCDIR([po]) AC_CONFIG_HEADERS([config.h]) AC_LANG(C) AM_INIT_AUTOMAKE @@ -475,14 +474,6 @@ fi ############################################################################ -# Check if support for gettext was requested and available. -############################################################################ -AM_ICONV -AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.20]) -LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" - -############################################################################ # Check if debug mode was requested. ############################################################################ AC_ARG_ENABLE(debug, @@ -548,8 +539,7 @@ AC_SUBST(SYSCONF, "$SYSCONF") AC_SUBST(PACKAGE, "$PACKAGE") -AC_CONFIG_FILES([po/Makefile.in - Makefile +AC_CONFIG_FILES([Makefile src/Makefile contrib/Makefile jwm.1