diff -ru plugger-4.0.orig/Makefile plugger-4.0/Makefile --- plugger-4.0.orig/Makefile 2001-12-07 16:59:20.000000000 +0100 +++ plugger-4.0/Makefile 2002-12-11 16:02:37.000000000 +0100 @@ -1,8 +1,8 @@ -# Where is your Plugin Source Development Kit from Netscape? -SDK=/home/hubbe/src/PluginSDK30b5 +# Where are your Mozilla includes? +SDK=/usr/include/mozilla # Where is your Xwindows located? -X11=/usr/X11/ +X11=/usr/X11R6 # # For building rpms @@ -11,7 +11,10 @@ # You may want to change this to /usr/ on # some installations. prefix=/usr/local - +mandir=$(prefix)/man +bindir=$(prefix)/bin +sysconfdir=$(prefix)/etc +plugindir=$(prefix)/lib/mozilla/plugins # # RPMDIR=/usr/src/RPM @@ -91,7 +94,7 @@ BIN_FILES=plugger.so plugger-$(VERSION) DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" # -DDEBUG # -DPLUGIN_TRACE -COMMON_CFLAGS=-O -I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) +COMMON_CFLAGS=-O -I$(SDK)/plugin -I$(SDK)/java -I$(SDK)/nspr -I$(X11)/include -DXP_UNIX $(DEFINES) COMMON_LDFLAGS= NORM_CFLAGS= NORM_LDFLAGS= @@ -117,8 +120,8 @@ plugger.o: plugger.c plugger.h $(CC) -c $(SHARED_CFLAGS) -o plugger.o plugger.c -common.o: $(SDK)/common/npunix.c - $(CC) -c $(SHARED_CFLAGS) -o common.o $(SDK)/common/npunix.c +common.o: npunix.c + $(CC) -c $(SHARED_CFLAGS) -o common.o npunix.c clean: -rm *.o @@ -141,17 +144,14 @@ install: - -@mkdir $(root)$(prefix) 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/bin 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/lib 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/man 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/man/man7 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/lib/netscape 1>/dev/null 2>&1 || : - -@mkdir $(root)$(prefix)/lib/netscape/plugins 1>/dev/null 2>&1 || : - cp plugger-$(VERSION) $(root)$(prefix)/bin/ - cp plugger.so $(root)$(prefix)/lib/netscape/plugins/ - if [ ! -f $(root)/etc/pluggerrc-$(VERSION) ]; then cp pluggerrc $(root)/etc/pluggerrc-$(VERSION) ; fi - cp plugger.7 $(root)$(prefix)/man/man7/ + -@mkdir -p $(root)$(bindir) + -@mkdir -p $(root)$(mandir)/man7 + -@mkdir -p $(root)$(plugindir) + -@mkdir -p $(root)$(sysconfdir) + cp plugger-$(VERSION) $(root)$(bindir) + cp plugger.so $(root)$(plugindir) + if [ ! -f $(root)/etc/pluggerrc-$(VERSION) ]; then cp pluggerrc $(root)$(sysconfdir)/pluggerrc-$(VERSION) ; fi + cp plugger.7 $(root)$(mandir)/man7/ plugger-$(VERSION).tar.gz: $(BASE_FILES) $(SOURCE_FILES) @( DIR=`pwd`;\ diff -ru plugger-4.0.orig/plugger.c plugger-4.0/plugger.c --- plugger-4.0.orig/plugger.c 2001-12-05 22:49:45.000000000 +0100 +++ plugger-4.0/plugger.c 2002-12-11 15:46:23.000000000 +0100 @@ -620,7 +620,7 @@ } /* Let netscape know things about plugger */ -NPError NPP_GetValue(void *future, NPPVariable variable, void *value) +NPError NPP_GetValue(NPP future, NPPVariable variable, void *value) { NPError err = NPERR_NO_ERROR;