From adfae89daffafd4f1a07dcc2a6f4689cf07c2b54 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 2 Jul 2012 11:16:13 +0200 Subject: [PATCH] Makefile.in: do not ignore $(DESTDIR) when installing data --- Makefile.in | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 60b8966..111f4e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,10 +84,10 @@ units_cur_inst: units_cur sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst install-support: definitions.units currency.units units_cur_inst - $(srcdir)/mkinstalldirs @UDAT@ $(DESTDIR)$(bindir) - $(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units - $(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units - $(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map + $(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) + $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units + $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units + $(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT@locale.map $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` install: units@EXEEXT@ install-doc install-support @@ -138,8 +138,9 @@ Makefile: Makefile.in config.status uninstall: -rm -f $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'` \ $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1 \ - $(DESTDIR)$(infodir)/units.info @UDAT@definitions.units \ - @UDAT@currency.units \ + $(DESTDIR)$(infodir)/units.info \ + $(DESTDIR)@UDAT@definitions.units \ + $(DESTDIR)@UDAT@currency.units \ @if test -f $(DESTDIR)$(infodir)/dir; then \ echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir; \ else true; fi -- 1.7.1