yann@1: #!/bin/sh -e yann@1: ## 001_ld_makefile_patch.dpatch yann@1: ## yann@1: ## All lines beginning with `## DP:' are a description of the patch. yann@1: ## DP: Description: correct where ld scripts are installed yann@1: ## DP: Author: Chris Chimelis yann@1: ## DP: Upstream status: N/A yann@1: ## DP: Date: ?? yann@1: yann@1: if [ $# -ne 1 ]; then yann@1: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" yann@1: exit 1 yann@1: fi yann@1: yann@1: [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts yann@1: patch_opts="${patch_opts:--f --no-backup-if-mismatch}" yann@1: yann@1: case "$1" in yann@1: -patch) patch $patch_opts -p1 < $0;; yann@1: -unpatch) patch $patch_opts -p1 -R < $0;; yann@1: *) yann@1: echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" yann@1: exit 1;; yann@1: esac yann@1: yann@1: exit 0 yann@1: yann@1: @DPATCH@ yann@1: --- binutils-2.16.91.0.1/ld/Makefile.am yann@1: +++ binutils-2.16.91.0.1/ld/Makefile.am yann@1: @@ -20,7 +20,7 @@ yann@1: # We put the scripts in the directory $(scriptdir)/ldscripts. yann@1: # We can't put the scripts in $(datadir) because the SEARCH_DIR yann@1: # directives need to be different for native and cross linkers. yann@1: -scriptdir = $(tooldir)/lib yann@1: +scriptdir = $(libdir) yann@1: yann@1: EMUL = @EMUL@ yann@1: EMULATION_OFILES = @EMULATION_OFILES@ yann@1: --- binutils-2.16.91.0.1/ld/Makefile.in yann@1: +++ binutils-2.16.91.0.1/ld/Makefile.in yann@1: @@ -268,7 +268,7 @@ yann@1: # We put the scripts in the directory $(scriptdir)/ldscripts. yann@1: # We can't put the scripts in $(datadir) because the SEARCH_DIR yann@1: # directives need to be different for native and cross linkers. yann@1: -scriptdir = $(tooldir)/lib yann@1: +scriptdir = $(libdir) yann@1: BASEDIR = $(srcdir)/.. yann@1: BFDDIR = $(BASEDIR)/bfd yann@1: INCDIR = $(BASEDIR)/include