components/nethack/patches/make.patch
author Enrico Perla <enrico.perla@oracle.com>
Fri, 04 Nov 2016 05:32:50 -0700
changeset 7245 934578b959f0
parent 5859 98bc99958997
permissions -rw-r--r--
20029192 Userland should build with ld -z sx=nx* flags instead of map.noexstk 23118364 Enable ADIHEAP on security sensitive binaries 23118359 Build openssh as PIE
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5859
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
The makefiles don't really allow for a proto-area-style install; this
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
tweak, plus the bits in files/solaris, let this happen correctly.
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
--- sys/unix/Makefile.top	2015-11-18 12:54:59.000000000 -0800
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
+++ sys/unix/Makefile.top	2016-04-14 16:37:08.807692850 -0700
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
@@ -206,7 +206,7 @@
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
 	cp util/recover $(INSTDIR)
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
 	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 	if test -n '$(SHELLDIR)'; then \
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
-		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
+		sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_HACKDIR);' \
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
 		< sys/unix/nethack.sh \
98bc99958997 23141914 nethack 3.6.0
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
 		> $(SHELLDIR)/$(GAME) ; fi