Annotation of /trunk/gpac/patches/gpac-0.4.2-DESTDIR.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 4467 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 4467 byte(s)
-import
1 | niro | 144 | diff -ur gpac.orig/Makefile gpac/Makefile |
2 | --- gpac.orig/Makefile 2006-08-01 11:35:35.000000000 -0400 | ||
3 | +++ gpac/Makefile 2006-08-01 11:39:19.000000000 -0400 | ||
4 | @@ -53,13 +53,13 @@ | ||
5 | ( 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 *.~*) | ||
6 | |||
7 | install: | ||
8 | - install -d "$(prefix)/bin" | ||
9 | - install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(prefix)/bin" | ||
10 | + install -d "$(DESTDIR)$(prefix)/bin" | ||
11 | + install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin" | ||
12 | $(MAKE) -C applications install | ||
13 | - install -d "$(moddir)" | ||
14 | - install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" | ||
15 | - rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) | ||
16 | - rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) | ||
17 | + install -d "$(DESTDIR)$(moddir)" | ||
18 | + install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)" | ||
19 | + rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX) | ||
20 | + rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) | ||
21 | ifeq ($(CONFIG_WIN32),yes) | ||
22 | install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib | ||
23 | else | ||
24 | @@ -70,15 +70,15 @@ | ||
25 | install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) | ||
26 | ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) | ||
27 | else | ||
28 | - install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) | ||
29 | - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) | ||
30 | + install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) | ||
31 | + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) | ||
32 | ldconfig || true | ||
33 | endif | ||
34 | endif | ||
35 | - install -d "$(mandir)/man1" | ||
36 | - install -m 644 doc/man/mp4box.1 $(mandir)/man1/ | ||
37 | - install -m 644 doc/man/mp4client.1 $(mandir)/man1/ | ||
38 | - install -m 644 doc/man/gpac.1 $(mandir)/man1/ | ||
39 | + install -d "$(DESTDIR)$(mandir)/man1" | ||
40 | + install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ | ||
41 | + install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ | ||
42 | + install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ | ||
43 | |||
44 | uninstall: | ||
45 | $(MAKE) -C applications uninstall | ||
46 | @@ -91,14 +91,14 @@ | ||
47 | rm -rf $(mandir)/man1/gpac.1 | ||
48 | |||
49 | install-lib: | ||
50 | - mkdir -p "$(prefix)/include/gpac" | ||
51 | - install -m 644 $(SRC_PATH)/include/gpac/*.h "$(prefix)/include/gpac" | ||
52 | - mkdir -p "$(prefix)/include/gpac/internal" | ||
53 | - install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(prefix)/include/gpac/internal" | ||
54 | - mkdir -p "$(prefix)/include/gpac/modules" | ||
55 | - install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(prefix)/include/gpac/modules" | ||
56 | - mkdir -p "$(prefix)/lib" | ||
57 | - install -m 644 "./bin/gcc/libgpac_static.a" "$(prefix)/lib" | ||
58 | + mkdir -p "$(DESTDIR)$(prefix)/include/gpac" | ||
59 | + install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" | ||
60 | + mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" | ||
61 | + install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" | ||
62 | + mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" | ||
63 | + install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" | ||
64 | + mkdir -p "$(DESTDIR)$(prefix)/lib" | ||
65 | + install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib" | ||
66 | |||
67 | uninstall-lib: | ||
68 | rm -rf "$(prefix)/include/gpac/internal" | ||
69 | Only in gpac: Makefile.orig | ||
70 | diff -ur gpac.orig/applications/mp4client/Makefile gpac/applications/mp4client/Makefile | ||
71 | --- gpac.orig/applications/mp4client/Makefile 2006-08-01 11:35:35.000000000 -0400 | ||
72 | +++ gpac/applications/mp4client/Makefile 2006-08-01 11:36:16.000000000 -0400 | ||
73 | @@ -50,7 +50,7 @@ | ||
74 | |||
75 | install: clean | ||
76 | make -override BUILD_INSTALL=yes all | ||
77 | - install -c -s -m 755 ../../bin/gcc/MP4Client "$(prefix)/bin" | ||
78 | + install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin" | ||
79 | |||
80 | uninstall: | ||
81 | rm -rf $(prefix)/bin/MP4Client | ||
82 | Only in gpac/applications/mp4client: Makefile.orig | ||
83 | diff -ur gpac.orig/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile | ||
84 | --- gpac.orig/applications/osmo4_wx/Makefile 2006-08-01 11:35:35.000000000 -0400 | ||
85 | +++ gpac/applications/osmo4_wx/Makefile 2006-08-01 11:36:16.000000000 -0400 | ||
86 | @@ -65,7 +65,7 @@ | ||
87 | else | ||
88 | rm -f wxOsmo4.o | ||
89 | make -override BUILD_INSTALL=yes all | ||
90 | - install -c -s -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin" | ||
91 | + install -c -s -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin" | ||
92 | endif | ||
93 | |||
94 | uninstall: | ||
95 | Only in gpac/applications/osmo4_wx: Makefile.orig |