--- libqdwav/Makefile.in
+++ libqdwav/Makefile.in
@@ -96,7 +96,6 @@
 
 noinst_LIBRARIES = 	libqdwav.a
 
-CFLAGS = 		-O2
 
 libqdwav_a_SOURCES = 	wav_read.c wav_write.c
 
--- po/Makefile.in.in
+++ po/Makefile.in.in
@@ -111,9 +111,9 @@
 install-data-no: all
 install-data-yes: all
 	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -122,6 +122,7 @@
 	    *.gmo) destdir=$(gnulocaledir);; \
 	    *)     destdir=$(localedir);; \
 	  esac; \
+	  destdir="$(DESTDIR)$$destdir"; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r "$(MKINSTALLDIRS)"; then \