Gentoo Attachment #108457 for bug #156083

View | Details | Raw Unified
Collapse All | Expand All

(-) netboot-0.10.1/bootrom/Makefile (-9 / +9 lines)

Lines 56-76	Link Here

# Install all files in place

# Install all files in place

instbin:

instbin:

	@echo Make all necessary directories

	@echo Make all necessary directories

	$(INSTALL) -d $(nbbindir)

	$(INSTALL) -d $(DESTDIR)$(nbbindir)

	$(INSTALL) -d $(nbmiscdir)

	$(INSTALL) -d $(DESTDIR)$(nbmiscdir)

	@echo Remove files of old versions

	@echo Remove files of old versions

	@if test -d $(nblibdir)/binaries; then			\

	@if test -d $(DESTDIR)$(nblibdir)/binaries; then			\

	  rm -f $(nblibdir)/binaries/*86.bin;			\

	  rm -f $(DESTDIR)$(nblibdir)/binaries/*86.bin;			\

	  rm -f $(nblibdir)/binaries/kernelm.bin;		\

	  rm -f $(DESTDIR)$(nblibdir)/binaries/kernelm.bin;		\

fi

fi

	@echo Install new binaries

	@echo Install new binaries

	@for i in $(bindestdir)/*.bin; do			\

	@for i in $(bindestdir)/*.bin; do			\

	  echo $(INSTALL_DATA) $$i $(nbbindir);			\

	  echo $(INSTALL_DATA) $$i $(DESTDIR)$(nbbindir);			\

	  $(INSTALL_DATA) $$i $(nbbindir);			\

	  $(INSTALL_DATA) $$i $(DESTDIR)$(nbbindir);			\

	done

	done

	@for i in $(bindestdir)/*.com; do			\

	@for i in $(bindestdir)/*.com; do			\

	  echo $(INSTALL_DATA) $$i $(nbmiscdir);		\

	  echo $(INSTALL_DATA) $$i $(DESTDIR)$(nbmiscdir);		\

	  $(INSTALL_DATA) $$i $(nbmiscdir);			\

	  $(INSTALL_DATA) $$i $(DESTDIR)$(nbmiscdir);			\

	done

	done

install:	install-recursive instbin

install:	install-recursive instbin

(-) netboot-0.10.1/bootrom/netdrvr/Makefile (-1 / +2 lines)

Lines 55-63	Link Here

netdrvr-nognu:

netdrvr-nognu:

netdrvr-inst:	$(TARGETS)

netdrvr-inst:	$(TARGETS)

		$(INSTALL) -d $(DESTDIR)$(bindestdir)

		@for i in $^; do				\

		@for i in $^; do				\

		  j=`basename $$i`;				\

		  j=`basename $$i`;				\

		  $(CPATTR) $$i $(bindestdir)/$$j;		\

		  $(CPATTR) $$i $(DESTDIR)$(bindestdir)/$$j;		\

		done

		done

(-) netboot-0.10.1/bootrom/netdrvr/ndis2/drivers/Makefile (-4 / +4 lines)

Lines 53-59	Link Here

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

			-t $(MODSUBDIR) -s drivers -v \

			-t $(MODSUBDIR) -s drivers -v \

			-n $(ROMDIR)/netdrvr -m $(MD5SUMS) \

			-n $(DESTDIR)$(ROMDIR)/netdrvr -m $(MD5SUMS) \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

Lines 64-75	Link Here

# Installation

# Installation

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

	$(INSTALL) -d $(nbnetdrvdir)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)

	$(INSTALL) -d $(nbnetdrvdir)/$(MODSUBDIR)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)/$(MODSUBDIR)

	@echo Installing network drivers

	@echo Installing network drivers

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

			-t $(MODSUBDIR) -v \

			-t $(MODSUBDIR) -v \

			-n $(nbnetdrvdir) -m $(nbnetdrvdir)/MD5SUMS \

			-n $(DESTDIR)$(nbnetdrvdir) -m $(nbnetdrvdir)/MD5SUMS \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

(-) netboot-0.10.1/bootrom/netdrvr/pktdrvr/drivers/Makefile (-4 / +4 lines)

Lines 53-59	Link Here

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

			-t $(MODSUBDIR) -s drivers -v \

			-t $(MODSUBDIR) -s drivers -v \

			-n $(ROMDIR)/netdrvr -m $(MD5SUMS) \

			-n $(DESTDIR)$(ROMDIR)/netdrvr -m $(MD5SUMS) \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

Lines 64-75	Link Here

# Installation

# Installation

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

	$(INSTALL) -d $(nbnetdrvdir)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)

	$(INSTALL) -d $(nbnetdrvdir)/$(MODSUBDIR)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)/$(MODSUBDIR)

	@echo Installing network drivers

	@echo Installing network drivers

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

			-t $(MODSUBDIR) -v \

			-t $(MODSUBDIR) -v \

			-n $(nbnetdrvdir) -m $(nbnetdrvdir)/MD5SUMS \

			-n $(DESTDIR)$(nbnetdrvdir) -m $(DESTDIR)$(nbnetdrvdir)/MD5SUMS \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

(-) netboot-0.10.1/bootrom/netdrvr/undi/drivers/Makefile (-4 / +4 lines)

Lines 53-59	Link Here

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

$(MD5SUMS):	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

		@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) -u \

			-t $(MODSUBDIR) -s drivers -v \

			-t $(MODSUBDIR) -s drivers -v \

			-n $(ROMDIR)/netdrvr -m $(MD5SUMS) \

			-n $(DESTDIR)$(ROMDIR)/netdrvr -m $(MD5SUMS) \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

Lines 64-75	Link Here

# Installation

# Installation

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

install:	$(DRIVERS) | $(INSTDRV) $(MD5PROG)

	$(INSTALL) -d $(nbnetdrvdir)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)

	$(INSTALL) -d $(nbnetdrvdir)/$(MODSUBDIR)

	$(INSTALL) -d $(DESTDIR)$(nbnetdrvdir)/$(MODSUBDIR)

	@echo Installing network drivers

	@echo Installing network drivers

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

	@MD5PROG="$(MD5PROGEXEC)" INSTALL="$(INSTALL)" $(INSTDRV) \

			-t $(MODSUBDIR) -v \

			-t $(MODSUBDIR) -v \

			-n $(nbnetdrvdir) -m $(nbnetdrvdir)/MD5SUMS \

			-n $(DESTDIR)$(nbnetdrvdir) -m $(nbnetdrvdir)/MD5SUMS \

			$(foreach fname,$(DRIVERS),-d $(fname))

			$(foreach fname,$(DRIVERS),-d $(fname))

(-) netboot-0.10.1/include/Makefile (-2 / +2 lines)

Lines 30-37	Link Here

install:	nblib.h

install:	nblib.h

		$(INSTALL) -d $(includedir)

		$(INSTALL) -d $(DESTDIR)$(includedir)

		$(INSTALL_DATA) nblib.h $(includedir)/nblib.h

		$(INSTALL_DATA) nblib.h $(DESTDIR)$(includedir)/nblib.h

clean:

clean:

(-) netboot-0.10.1/makerom/Makefile (-6 / +6 lines)

Lines 104-116	Link Here

distrib:	stamp-flash-gnu

distrib:	stamp-flash-gnu

install:	$(LIBTOOL) all

install:	$(LIBTOOL) all

		$(INSTALL) -d $(bindir)

		$(INSTALL) -d $(DESTDIR)$(bindir)

		$(INSTALL) -d $(mandir)/man$(MANEXT)

		$(INSTALL) -d $(DESTDIR)$(mandir)/man$(MANEXT)

		$(INSTALL) -d $(nbdatadir)

		$(INSTALL) -d $(DESTDIR)$(nbdatadir)

		@$(LIBTOOL) --mode=install \

		@$(LIBTOOL) --mode=install \

		  $(INSTALL_PROGRAM) makerom $(bindir)/$(TARGET)

		  $(INSTALL_PROGRAM) makerom $(DESTDIR)$(bindir)/$(TARGET)

		$(INSTALL_DATA) makerom.man $(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) makerom.man $(DESTDIR)$(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) makerom.help $(nbdatadir)/makerom.help

		$(INSTALL_DATA) makerom.help $(DESTDIR)$(nbdatadir)/makerom.help

clean:		clean-local clean-recursive

clean:		clean-local clean-recursive

(-) netboot-0.10.1/misc/Makefile (-12 / +12 lines)

Lines 130-156	Link Here

install-config:		$(nbconfig)

install-config:		$(nbconfig)

	$(INSTALL) -d $(sysconfdir)

	$(INSTALL) -d $(DESTDIR)$(sysconfdir)

	$(INSTALL_DATA) $(nbconfig) $(sysconfdir)/$(nbconfig)

	$(INSTALL_DATA) $(nbconfig) $(DESTDIR)$(sysconfdir)/$(nbconfig)

install-drivers:	$(drivers)

install-drivers:	$(drivers)

	$(INSTALL) -d $(nblibdir)

	$(INSTALL) -d $(DESTDIR)$(nblibdir)

	$(INSTALL_DATA) $(drivers) $(nblibdir)/$(drivers)

	$(INSTALL_DATA) $(drivers) $(DESTDIR)$(nblibdir)/$(drivers)

install-man:		netboot.man $(nbconfig).man $(drivers).man $(db).man

install-man:		netboot.man $(nbconfig).man $(drivers).man $(db).man

	$(INSTALL) -d $(mandir)/man$(MANEXT)

	$(INSTALL) -d $(DESTDIR)$(mandir)/man$(MANEXT)

	$(INSTALL_DATA) netboot.man $(mandir)/man$(MANEXT)/netboot.$(MANEXT)

	$(INSTALL_DATA) netboot.man $(DESTDIR)$(mandir)/man$(MANEXT)/netboot.$(MANEXT)

	$(INSTALL_DATA) $(nbconfig).man $(mandir)/man$(MANEXT)/$(nbconfig).$(MANEXT)

	$(INSTALL_DATA) $(nbconfig).man $(DESTDIR)$(mandir)/man$(MANEXT)/$(nbconfig).$(MANEXT)

	$(INSTALL_DATA) $(drivers).man $(mandir)/man$(MANEXT)/$(drivers).$(MANEXT)

	$(INSTALL_DATA) $(drivers).man $(DESTDIR)$(mandir)/man$(MANEXT)/$(drivers).$(MANEXT)

	$(INSTALL_DATA) $(db).man $(mandir)/man$(MANEXT)/$(db).$(MANEXT)

	$(INSTALL_DATA) $(db).man $(DESTDIR)$(mandir)/man$(MANEXT)/$(db).$(MANEXT)

install-utils:		instdrv nbmd5

install-utils:		instdrv nbmd5

	$(INSTALL) -d $(nbutildir)

	$(INSTALL) -d $(DESTDIR)$(nbutildir)

	$(INSTALL_SCRIPT) instdrv $(nbutildir)/instdrv

	$(INSTALL_SCRIPT) instdrv $(DESTDIR)$(nbutildir)/instdrv

	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) nbmd5 $(nbutildir)/nbmd5

	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) nbmd5 $(DESTDIR)$(nbutildir)/nbmd5

clean:	clean-general clean-recursive

clean:	clean-general clean-recursive

(-) netboot-0.10.1/misc/instdrv.in (-7 / +7 lines)

Lines 497-517	Link Here

	# its final destination.

	# its final destination.

	if [ "$DOINSTALL" = "TRUE" ]; then

	if [ "$DOINSTALL" = "TRUE" ]; then

		DESTDIR="${NETDRVDIR}/${dname}"

		DDIR="${NETDRVDIR}/${dname}"

		if [ "$VERBOSE" -gt 0 ]; then

		if [ "$VERBOSE" -gt 0 ]; then

			echo "Installing $sname into $DESTDIR"

			echo "Installing $sname into $DDIR"

fi

fi

		if [ ! -d "$DESTDIR" ]; then

		if [ ! -d "$DDIR" ]; then

			if [ "$DEBUG" = "TRUE" ]; then

			if [ "$DEBUG" = "TRUE" ]; then

				echo "$INSTPROG -d $DESTDIR"

				echo "$INSTPROG -d $DDIR"

			else

			else

				$INSTPROG -d $DESTDIR

				$INSTPROG -d $DDIR

fi

fi

fi

fi

		if [ "$DEBUG" = "TRUE" ]; then

		if [ "$DEBUG" = "TRUE" ]; then

			echo "$INSTPROG -m 644 $sname $DESTDIR/$fname"

			echo "$INSTPROG -m 644 $sname $DDIR/$fname"

		else

		else

			$INSTPROG -m 644 $sname $DESTDIR/$fname

			$INSTPROG -m 644 $sname $DDIR/$fname

fi

fi

fi

fi

done <$TMPSRC 5>>$TMPMD5

done <$TMPSRC 5>>$TMPMD5

(-) netboot-0.10.1/misc/romcheck/Makefile (-2 / +2 lines)

Lines 70-77	Link Here

# Install

# Install

install:	romcheck-$(GNU16BIT)

install:	romcheck-$(GNU16BIT)

		$(INSTALL) -d $(nbmiscdir)

		$(INSTALL) -d $(DESTDIR)$(nbmiscdir)

		$(INSTALL_DATA) romcheck.bin $(nbmiscdir)/romcheck.bin

		$(INSTALL_DATA) romcheck.bin $(DESTDIR)$(nbmiscdir)/romcheck.bin

# Clean up

# Clean up

(-) netboot-0.10.1/mknbi-dos/Makefile (-4 / +4 lines)

Lines 133-143	Link Here

install:	$(LIBTOOL) all

install:	$(LIBTOOL) all

		$(INSTALL) -d $(bindir)

		$(INSTALL) -d $(DESTDIR)$(bindir)

		$(INSTALL) -d $(mandir)/man$(MANEXT)

		$(INSTALL) -d $(DESTDIR)$(mandir)/man$(MANEXT)

		@$(LIBTOOL) --mode=install \

		@$(LIBTOOL) --mode=install \

		  $(INSTALL_PROGRAM) mknbi $(bindir)/$(TARGET)

		  $(INSTALL_PROGRAM) mknbi $(DESTDIR)$(bindir)/$(TARGET)

		$(INSTALL_DATA) mknbi.man $(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) mknbi.man $(DESTDIR)$(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		@echo making install in utils

		@echo making install in utils

		@(cd utils && $(MAKE) install) || exit 1

		@(cd utils && $(MAKE) install) || exit 1

(-) netboot-0.10.1/mknbi-dos/utils/Makefile (-5 / +5 lines)

Lines 79-89	Link Here

# Install

# Install

install:	tools

install:	tools

		$(INSTALL) -d $(nbmiscdir)

		$(INSTALL) -d $(DESTDIR)$(nbmiscdir)

		$(INSTALL) -d $(nbutildir)

		$(INSTALL) -d $(DESTDIR)$(nbutildir)

		$(INSTALL_DATA) rmrd.com $(nbmiscdir)/rmrd.com

		$(INSTALL_DATA) rmrd.com $(DESTDIR)$(nbmiscdir)/rmrd.com

		$(INSTALL_DATA) nbramdrv.sys $(nbmiscdir)/nbramdrv.sys

		$(INSTALL_DATA) nbramdrv.sys $(DESTDIR)$(nbmiscdir)/nbramdrv.sys

		$(INSTALL_SCRIPT) mntnbi.pl $(nbutildir)/mntnbi.pl

		$(INSTALL_SCRIPT) mntnbi.pl $(DESTDIR)$(nbutildir)/mntnbi.pl

# Clean up

# Clean up

(-) netboot-0.10.1/mknbi-linux/Makefile (-4 / +4 lines)

Lines 104-114	Link Here

distrib:	stamp-first-gnu stamp-firstd-gnu

distrib:	stamp-first-gnu stamp-firstd-gnu

install:	$(LIBTOOL) all

install:	$(LIBTOOL) all

		$(INSTALL) -d $(bindir)

		$(INSTALL) -d $(DESTDIR)$(bindir)

		$(INSTALL) -d $(mandir)/man$(MANEXT)

		$(INSTALL) -d $(DESTDIR)$(mandir)/man$(MANEXT)

		@$(LIBTOOL) --mode=install \

		@$(LIBTOOL) --mode=install \

		  $(INSTALL_PROGRAM) mknbi $(bindir)/$(TARGET)

		  $(INSTALL_PROGRAM) mknbi $(DESTDIR)$(bindir)/$(TARGET)

		$(INSTALL_DATA) mknbi.man $(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) mknbi.man $(DESTDIR)$(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

clean:			clean-local clean-recursive

clean:			clean-local clean-recursive

(-) netboot-0.10.1/mknbi-mgl/Makefile (-6 / +6 lines)

Lines 197-209	Link Here

		$(DISTSRCS)

		$(DISTSRCS)

install:	$(LIBTOOL) all

install:	$(LIBTOOL) all

		$(INSTALL) -d $(bindir)

		$(INSTALL) -d $(DESTDIR)$(bindir)

		$(INSTALL) -d $(mandir)/man$(MANEXT)

		$(INSTALL) -d $(DESTDIR)$(mandir)/man$(MANEXT)

		@$(LIBTOOL) --mode=install \

		@$(LIBTOOL) --mode=install \

		  $(INSTALL_PROGRAM) mknbi $(bindir)/$(TARGET)

		  $(INSTALL_PROGRAM) mknbi $(DESTDIR)$(bindir)/$(TARGET)

		$(INSTALL_DATA) mknbi.man $(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) mknbi.man $(DESTDIR)$(mandir)/man$(MANEXT)/$(TARGET).$(MANEXT)

		$(INSTALL_DATA) misc/mgl.vim $(nbmiscdir)/mgl.vim

		$(INSTALL_DATA) misc/mgl.vim $(DESTDIR)$(nbmiscdir)/mgl.vim

		$(INSTALL_DATA) test/menu.mgl $(nbmiscdir)/menu.mgl

		$(INSTALL_DATA) test/menu.mgl $(DESTDIR)$(nbmiscdir)/menu.mgl

test:		mknbi

test:		mknbi

(-) netboot-0.10.1/nblib/Makefile (-2 / +2 lines)

Lines 88-96	Link Here

# Install library

# Install library

install:	$(LIBTOOL) $(TARGET)

install:	$(LIBTOOL) $(TARGET)

	$(INSTALL) -d $(libdir)

	$(INSTALL) -d $(DESTDIR)$(libdir)

	@$(LIBTOOL) --mode=install \

	@$(LIBTOOL) --mode=install \

	  $(INSTALL_PROGRAM) $(TARGET) $(libdir)/$(TARGET)

	  $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)

# Cleanup

# Cleanup

Attachment #108457: netboot-0.10.1-destdir.patch for bug #156083