a03d116397
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
20 lines
921 B
Diff
20 lines
921 B
Diff
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -41,7 +41,7 @@
|
|
PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
|
|
PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),
|
|
PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept),
|
|
- PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr/local", PathVariable.PathIsDirCreate),
|
|
+ PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr", PathVariable.PathIsDirCreate),
|
|
)
|
|
opts.Update(env)
|
|
Help(opts.GenerateHelpText(env))
|
|
@@ -150,7 +150,7 @@
|
|
|
|
|
|
# Install the binary:
|
|
-env.Install("$DESTDIR$PREFIX/games", sky)
|
|
+env.Install("$DESTDIR$PREFIX/bin", sky)
|
|
|
|
# Install the desktop file:
|
|
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
|