From ef185b3b04eeb4bf94f6be6bfe57f0daef0faca1 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 9 Sep 2008 09:02:53 +0000 Subject: Make install/uninstall consider DESTDIR svn path=/trunk/libparserutils/; revision=5292 --- build/Makefile.common | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'build') diff --git a/build/Makefile.common b/build/Makefile.common index c0f492b..b5e9525 100644 --- a/build/Makefile.common +++ b/build/Makefile.common @@ -93,24 +93,24 @@ export: @$(MAKE) install PREFIX="$(TOP)/dist" install: release - @$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/lib/pkgconfig - @$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/include/parserutils - @$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/include/parserutils/charset - @$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/include/parserutils/input - @$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/include/parserutils/utils + @$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/lib/pkgconfig + @$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/include/parserutils + @$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/include/parserutils/charset + @$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/include/parserutils/input + @$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/include/parserutils/utils @$(SED) -e 's#PREFIX#$(PREFIX)#' $(COMPONENT).pc.in >$(COMPONENT).pc - @$(INSTALL) --mode=644 -t $(PREFIX)/lib $(COMPONENT).a - @$(INSTALL) --mode=644 -t $(PREFIX)/lib/pkgconfig $(COMPONENT).pc - @$(INSTALL) --mode=644 -t $(PREFIX)/include/parserutils $(filter %.h, $(wildcard include/parserutils/*)) - @$(INSTALL) --mode=644 -t $(PREFIX)/include/parserutils/charset $(filter %.h, $(wildcard include/parserutils/charset/*)) - @$(INSTALL) --mode=644 -t $(PREFIX)/include/parserutils/input $(filter %.h, $(wildcard include/parserutils/input/*)) - @$(INSTALL) --mode=644 -t $(PREFIX)/include/parserutils/utils $(filter %.h, $(wildcard include/parserutils/utils/*)) + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/lib $(COMPONENT).a + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/lib/pkgconfig $(COMPONENT).pc + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/include/parserutils $(filter %.h, $(wildcard include/parserutils/*)) + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/include/parserutils/charset $(filter %.h, $(wildcard include/parserutils/charset/*)) + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/include/parserutils/input $(filter %.h, $(wildcard include/parserutils/input/*)) + @$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/include/parserutils/utils $(filter %.h, $(wildcard include/parserutils/utils/*)) uninstall: - @$(RM) $(RMFLAGS) $(PREFIX)/lib/$(COMPONENT).a - @$(RM) $(RMFLAGS) $(PREFIX)/lib/pkgconfig/$(COMPONENT).pc - @$(RM) $(RMFLAGS) -r $(PREFIX)/include/parserutils + @$(RM) $(RMFLAGS) $(DESTDIR)$(PREFIX)/lib/$(COMPONENT).a + @$(RM) $(RMFLAGS) $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(COMPONENT).pc + @$(RM) $(RMFLAGS) -r $(DESTDIR)$(PREFIX)/include/parserutils $(RELEASEDIR)/deps/created: @$(MKDIR) $(MKDIRFLAGS) $(RELEASEDIR)/deps -- cgit v1.2.3