diff -ur gpac.orig/Makefile gpac/Makefile --- gpac.orig/Makefile 2006-08-01 11:35:35.000000000 -0400 +++ gpac/Makefile 2006-08-01 11:39:19.000000000 -0400 @@ -53,13 +53,13 @@ ( tar zcvf ~/$(FILE).tar.gz ../gpac --exclude CVS --exclude bin --exclude lib --exclude Obj --exclude temp --exclude amr_nb --exclude amr_nb_ft --exclude amr_wb_ft --exclude *.mak --exclude *.o --exclude *.~*) install: - install -d "$(prefix)/bin" - install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(prefix)/bin" + install -d "$(DESTDIR)$(prefix)/bin" + install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin" $(MAKE) -C applications install - install -d "$(moddir)" - install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" - rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) - rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) + install -d "$(DESTDIR)$(moddir)" + install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)" + rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX) + rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) ifeq ($(CONFIG_WIN32),yes) install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib else @@ -70,15 +70,15 @@ install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) else - install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) + install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) ldconfig || true endif endif - install -d "$(mandir)/man1" - install -m 644 doc/man/mp4box.1 $(mandir)/man1/ - install -m 644 doc/man/mp4client.1 $(mandir)/man1/ - install -m 644 doc/man/gpac.1 $(mandir)/man1/ + install -d "$(DESTDIR)$(mandir)/man1" + install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ + install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ + install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ uninstall: $(MAKE) -C applications uninstall @@ -91,14 +91,14 @@ rm -rf $(mandir)/man1/gpac.1 install-lib: - mkdir -p "$(prefix)/include/gpac" - install -m 644 $(SRC_PATH)/include/gpac/*.h "$(prefix)/include/gpac" - mkdir -p "$(prefix)/include/gpac/internal" - install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(prefix)/include/gpac/internal" - mkdir -p "$(prefix)/include/gpac/modules" - install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(prefix)/include/gpac/modules" - mkdir -p "$(prefix)/lib" - install -m 644 "./bin/gcc/libgpac_static.a" "$(prefix)/lib" + mkdir -p "$(DESTDIR)$(prefix)/include/gpac" + install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" + mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" + install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" + mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" + install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" + mkdir -p "$(DESTDIR)$(prefix)/lib" + install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib" uninstall-lib: rm -rf "$(prefix)/include/gpac/internal" Only in gpac: Makefile.orig diff -ur gpac.orig/applications/mp4client/Makefile gpac/applications/mp4client/Makefile --- gpac.orig/applications/mp4client/Makefile 2006-08-01 11:35:35.000000000 -0400 +++ gpac/applications/mp4client/Makefile 2006-08-01 11:36:16.000000000 -0400 @@ -50,7 +50,7 @@ install: clean make -override BUILD_INSTALL=yes all - install -c -s -m 755 ../../bin/gcc/MP4Client "$(prefix)/bin" + install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin" uninstall: rm -rf $(prefix)/bin/MP4Client Only in gpac/applications/mp4client: Makefile.orig diff -ur gpac.orig/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile --- gpac.orig/applications/osmo4_wx/Makefile 2006-08-01 11:35:35.000000000 -0400 +++ gpac/applications/osmo4_wx/Makefile 2006-08-01 11:36:16.000000000 -0400 @@ -65,7 +65,7 @@ else rm -f wxOsmo4.o make -override BUILD_INSTALL=yes all - install -c -s -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin" + install -c -s -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin" endif uninstall: Only in gpac/applications/osmo4_wx: Makefile.orig