Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/lua/patches/1.Makefile.patch
author Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
Wed, 26 Sep 2012 16:17:36 +0000
changeset 990 6bfca1239ccb
parent 115 c360825c3a3f
permissions -rw-r--r--
7197062 Upgrade lua to 5.2.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
     1
 
--- Makefile.~1~	2012-05-17 07:05:54.000000000 -0700
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
     2
 
+++ Makefile	2012-09-06 17:26:51.006475447 -0700
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
     3
 
@@ -4,25 +4,26 @@
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
 
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
 # Your platform. See PLATS for possible values.
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     7
 
-PLAT= none
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
+PLAT= solaris
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     9
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    10
 
 # Where to install. The installation starts in the src and doc directories,
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    11
 
 # so take care if INSTALL_TOP is not an absolute path. See the local target.
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    12
 
 # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    13
 
 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    14
 
-INSTALL_TOP= /usr/local
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    15
 
+INSTALL_TOP= $(ROOT)/usr
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    16
 
 INSTALL_BIN= $(INSTALL_TOP)/bin
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    17
 
 INSTALL_INC= $(INSTALL_TOP)/include
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    18
 
 INSTALL_LIB= $(INSTALL_TOP)/lib
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    19
 
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    20
 
+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    21
 
 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    22
 
 INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    23
 
+INSTALL_DOC= $(INSTALL_TOP)/share/doc/lua
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    24
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    25
 
 # How to install. If your install program does not support "-p", then
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    26
 
 # you may have to run ranlib on the installed liblua.a.
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    27
 
-INSTALL= install -p
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    28
 
-INSTALL_EXEC= $(INSTALL) -m 0755
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    29
 
-INSTALL_DATA= $(INSTALL) -m 0644
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    30
 
+INSTALL= ginstall -p
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    31
 
+INSTALL_EXEC= $(INSTALL) -m 0555
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    32
 
+INSTALL_DATA= $(INSTALL) -m 0444
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    33
 
 #
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    34
 
 # If you don't have "install" you can use "cp" instead.
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    35
 
 # INSTALL= cp -p
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    36
 
@@ -36,13 +37,14 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    37
 
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    38
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    39
 
 # Convenience platforms targets.
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    40
 
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    41
 
+PLATS= solaris
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    42
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    43
 
 # What to install.
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    44
 
 TO_BIN= lua luac
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    45
 
-TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    46
 
-TO_LIB= liblua.a
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    47
 
+TO_INC= lua.h luaconf.h lualib.h lauxlib.h
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    48
 
+TO_LIB= liblua.so
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    49
 
 TO_MAN= lua.1 luac.1
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    50
 
+TO_DOC= contents.html osi-certified-72x60.png logo.gif lua.css manual.css manual.html readme.html
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    51
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    52
 
 # Lua version and release.
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    53
 
 V= 5.2
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    54
 
@@ -58,11 +60,13 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    55
 
 	src/lua -v
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    56
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    57
 
 install: dummy
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    58
 
-	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    59
 
+	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_DOC) $(INSTALL_MAN) $(INSTALL_TEST)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    60
 
 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    61
 
 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    62
 
-	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    63
 
+	cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    64
 
 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    65
 
+	cd doc && $(INSTALL_DATA) $(TO_DOC) $(INSTALL_DOC)
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    66
 
+
97
c27cb2d7067c 7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    67
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    68
 
 uninstall:
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 115
diff changeset 
    69
 
 	cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
upstream/oracle/userland-gate