| 84d02762 |
1 | --- gpac/Makefile.orig 2006-03-17 22:16:39.000000000 +0100 |
| 2 | +++ gpac/Makefile 2006-03-17 22:17:29.000000000 +0100 |
| 3 | @@ -71,8 +71,8 @@ |
| 4 | ifeq ($(CONFIG_WIN32),yes) |
| 5 | install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib |
| e0dfbd5a |
6 | else |
| 84d02762 |
7 | - install -s -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) |
| 8 | - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) |
| 9 | + install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) |
| 10 | + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX) |
| 11 | #not sure wether darwin uses ldconfig or not... |
| 12 | ifeq ($(CONFIG_DARWIN),yes) |
| e0dfbd5a |
13 | else |
| 84d02762 |
14 | --- gpac/Makefile.orig 2006-03-17 22:27:49.000000000 +0100 |
| 15 | +++ gpac/Makefile 2006-03-17 22:27:58.000000000 +0100 |
| 16 | @@ -64,7 +64,7 @@ |
| 17 | install -c -s -m 755 bin/gcc/MP4Box "$(prefix)/bin" |
| 18 | install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin" |
| 19 | $(MAKE) -C applications install |
| 20 | - install -d "$(moddir)" |
| 21 | + install -d "$(libdir)/gpac" |
| 22 | install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" |
| 23 | rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) |
| 24 | rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) |
| 25 | --- gpac/applications/osmozilla/Makefile.orig 2006-03-17 22:47:48.000000000 +0100 |
| 26 | +++ gpac/applications/osmozilla/Makefile 2006-03-17 22:54:03.000000000 +0100 |
| 27 | @@ -5,10 +5,6 @@ |
| 28 | GECKO_PATH=$(SRC_PATH)/extra_lib/include/gecko-sdk |
| 29 | |
| 30 | USER_NAME=$(shell whoami) |
| 31 | -ifeq ($(USER_NAME), root) |
| 32 | -else |
| 33 | -MOZILLA_DIR=local |
| 34 | -endif |
| 35 | |
| 36 | CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include \ |
| 37 | -I$(GECKO_PATH) \ |
| 38 | @@ -71,18 +67,8 @@ |
| e0dfbd5a |
39 | endif |
| 84d02762 |
40 | |
| 41 | install: $(LIB) |
| 42 | -ifeq ($(MOZILLA_DIR), local) |
| 43 | -ifeq ($(USER_NAME), root) |
| 44 | - @echo "*** Root cannot install local mozilla plugins! ***" |
| 45 | - @echo "*** Exit root mode and reinstall mozilla plugin! ***" |
| 46 | -else |
| 47 | - install -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)" |
| 48 | - install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt" |
| 49 | -endif |
| 50 | -else |
| 51 | - install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)" |
| 52 | - install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt" |
| 53 | -endif |
| 54 | + install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)" |
| 55 | + install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt" |
| 56 | |
| 57 | dep: depend |
| 58 | |
| 59 | --- gpac/Makefile.orig 2006-03-17 22:55:15.000000000 +0100 |
| 60 | +++ gpac/Makefile 2006-03-17 22:56:22.000000000 +0100 |
| 61 | @@ -65,9 +65,9 @@ |
| 62 | install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin" |
| 63 | $(MAKE) -C applications install |
| 64 | install -d "$(libdir)/gpac" |
| 65 | - install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" |
| 66 | - rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) |
| 67 | - rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) |
| 68 | + install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(libdir)/gpac" |
| 69 | + rm -f $(libdir)/libgpac.$(DYN_LIB_SUFFIX) |
| 70 | + rm -f $(libdir)/nposmozilla.$(DYN_LIB_SUFFIX) |
| 259e7d69 |
71 | ifeq ($(CONFIG_WIN32),yes) |
| 84d02762 |
72 | install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib |
| 259e7d69 |
73 | else |
projects / packages / gpac.git / blame