Attachment #274609 for bug #368665




	mkdir -p $(DESTDIR)$(nphostdir) || :
	mkdir -p $(DESTDIR)$(nptargetdir) || :
ifeq ($(build_player),yes)
install.player: install.dirs $(npplayer_PROGRAM)
	$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)
	mkdir -p $(DESTDIR)$(bindir)
	$(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
else
install.player:
endif
install.wrapper: install.dirs $(npwrapper_LIBRARY)
	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY)
ifeq ($(build_viewer),yes)
install.viewer: install.dirs install.viewer.bin install.viewer.glue
install.libnoxshm: install.dirs do.install.libnoxshm
else
install.viewer:
install.libnoxshm:
endif
install.viewer.bin: install.dirs $(npviewer_PROGRAM)
	$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
install.viewer.glue:: install.dirs
	p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%);	\
	echo "#!/bin/sh" > $$p;								\
	echo "TARGET_OS=$(TARGET_OS)" >> $$p;						\

	echo "esac" >> $$p;								\
	echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p;			\        
	chmod 755 $$p
do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY)
	$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)
install.config: install.dirs $(npconfig_PROGRAM)
	$(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM)
	mkdir -p $(DESTDIR)$(bindir)
	$(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper
install.loader: install.dirs $(nploader_PROGRAM)
	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh
	$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime

Return to bug 368665

Lines 242-266 Link Here

(-)nspluginwrapper-1.4.0.orig//Makefile (-9 / +9 lines)
242	mkdir -p $(DESTDIR)$(nphostdir) \|\| :	242	mkdir -p $(DESTDIR)$(nphostdir) \|\| :
243	mkdir -p $(DESTDIR)$(nptargetdir) \|\| :	243	mkdir -p $(DESTDIR)$(nptargetdir) \|\| :
244	ifeq ($(build_player),yes)	244	ifeq ($(build_player),yes)
245	install.player: $(npplayer_PROGRAM)	245	install.player: install.dirs $(npplayer_PROGRAM)
246	$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)	246	$(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)
247	mkdir -p $(DESTDIR)$(bindir)	247	mkdir -p $(DESTDIR)$(bindir)
248	$(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer	248	$(LN_S) $(nphostdir)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
249	else	249	else
250	install.player:	250	install.player:
251	endif	251	endif
252	install.wrapper: $(npwrapper_LIBRARY)	252	install.wrapper: install.dirs $(npwrapper_LIBRARY)
253	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY)	253	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(nphostdir)/$(npwrapper_LIBRARY)
254	ifeq ($(build_viewer),yes)	254	ifeq ($(build_viewer),yes)
255	install.viewer: install.viewer.bin install.viewer.glue	255	install.viewer: install.dirs install.viewer.bin install.viewer.glue
256	install.libnoxshm: do.install.libnoxshm	256	install.libnoxshm: install.dirs do.install.libnoxshm
257	else	257	else
258	install.viewer:	258	install.viewer:
259	install.libnoxshm:	259	install.libnoxshm:
260	endif	260	endif
261	install.viewer.bin: $(npviewer_PROGRAM)	261	install.viewer.bin: install.dirs $(npviewer_PROGRAM)
262	$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)	262	$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
263	install.viewer.glue::	263	install.viewer.glue:: install.dirs
264	p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \	264	p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \
265	echo "#!/bin/sh" > $$p; \	265	echo "#!/bin/sh" > $$p; \
266	echo "TARGET_OS=$(TARGET_OS)" >> $$p; \	266	echo "TARGET_OS=$(TARGET_OS)" >> $$p; \
Lines 272-284 Link Here
272	echo "esac" >> $$p; \	272	echo "esac" >> $$p; \
273	echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \	273	echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \
274	chmod 755 $$p	274	chmod 755 $$p
275	do.install.libnoxshm: $(libnoxshm_LIBRARY)	275	do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY)
276	$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)	276	$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)
277	install.config: $(npconfig_PROGRAM)	277	install.config: install.dirs $(npconfig_PROGRAM)
278	$(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM)	278	$(INSTALL) -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(nphostdir)/$(npconfig_PROGRAM)
279	mkdir -p $(DESTDIR)$(bindir)	279	mkdir -p $(DESTDIR)$(bindir)
280	$(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper	280	$(LN_S) $(nphostdir)/$(npconfig_PROGRAM) $(DESTDIR)$(bindir)/nspluginwrapper
281	install.loader: $(nploader_PROGRAM)	281	install.loader: install.dirs $(nploader_PROGRAM)
282	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)	282	$(INSTALL) -m 755 $(nploader_PROGRAM) $(DESTDIR)$(npcommondir)/$(nploader_PROGRAM)
283	install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh	283	install.mkruntime: $(SRC_PATH)/utils/mkruntime.sh
284	$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime	284	$(INSTALL) -m 755 $< $(DESTDIR)$(npcommondir)/mkruntime