]>
Commit | Line | Data |
---|---|---|
13701c20 JB |
1 | --- gpac/Makefile.orig 2008-10-23 17:40:38.000000000 +0200 |
2 | +++ gpac/Makefile 2011-02-05 07:18:41.996686361 +0100 | |
3 | @@ -59,9 +59,6 @@ | |
84d02762 | 4 | ifeq ($(CONFIG_WIN32),yes) |
13701c20 | 5 | install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir) |
e0dfbd5a | 6 | else |
13701c20 JB |
7 | -ifeq ($(DEBUGBUILD),no) |
8 | - $(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX) | |
9 | -endif | |
84d02762 | 10 | ifeq ($(CONFIG_DARWIN),yes) |
13701c20 JB |
11 | install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) |
12 | ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX) | |
13 | --- gpac/applications/osmozilla/Makefile.orig 2008-11-24 09:54:12.000000000 +0100 | |
14 | +++ gpac/applications/osmozilla/Makefile 2011-02-05 07:20:46.968690551 +0100 | |
15 | @@ -6,10 +6,6 @@ | |
16 | USER_NAME=root | |
e0dfbd5a | 17 | else |
84d02762 | 18 | USER_NAME=$(shell whoami) |
19 | -ifeq ($(USER_NAME), root) | |
20 | -else | |
21 | -MOZILLA_DIR=local | |
22 | -endif | |
13701c20 | 23 | endif |
84d02762 | 24 | |
13701c20 JB |
25 | CFLAGS=$(CPPFLAGS) $(XUL_CFLAGS) -I$(SRC_PATH)/include |
26 | @@ -75,19 +71,8 @@ | |
e0dfbd5a | 27 | endif |
84d02762 | 28 | |
13701c20 | 29 | install: |
84d02762 | 30 | -ifeq ($(MOZILLA_DIR), local) |
31 | -ifeq ($(USER_NAME), root) | |
32 | - @echo "*** Root cannot install local mozilla plugins! ***" | |
33 | - @echo "*** Exit root mode and reinstall mozilla plugin! ***" | |
34 | -else | |
13701c20 | 35 | - $(MAKE) $(LIB) |
84d02762 | 36 | - install -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)" |
37 | - install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt" | |
38 | -endif | |
39 | -else | |
40 | - install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)" | |
41 | - install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt" | |
42 | -endif | |
43 | + install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)" | |
44 | + install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt" | |
45 | ||
13701c20 JB |
46 | uninstall: |
47 | ifeq ($(MOZILLA_DIR), local) |