--- po/lgeneral/Makefile.in.in
+++ po/lgeneral/Makefile.in.in
@@ -21,8 +21,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
+localedir = /usr/share/locale
+gnulocaledir = /usr/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po/lgeneral
 
@@ -99,11 +99,8 @@
 	$(XGETTEXT) $(XGETTEXTFLAGS) --default-domain=$(PACKAGE) \
 	  --directory=$(top_srcdir) --add-comments \
 	  --keyword=tr --keyword=TR_NOOP \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& $(MSGCONV) $(MSGCONVFLAGS) $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot 2> /dev/null \
-		&& rm -f $(PACKAGE).po )
+	  --files-from=$(srcdir)/POTFILES.in
+	$(MSGCONV) $(MSGCONVFLAGS) $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot || true
 
 $(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
 $(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
--- po/pg/Makefile.in.in
+++ po/pg/Makefile.in.in
@@ -23,8 +23,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
+localedir = /usr/share/locale
+gnulocaledir = /usr/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po/pg
 inst_dir = @inst_dir@