Fossil SCM
Fix the default Makefile so that it works out-of-the-box on Linux, MacOSX, NetBSD, and Solaris.
Commit
c845b2871400ddde804d209f413c32999454cd1c
Parent
06c5b3eb6d2c828…
1 file changed
+4
-6
M
Makefile
+4
-6
| --- Makefile | ||
| +++ Makefile | ||
| @@ -41,16 +41,14 @@ | ||
| 41 | 41 | # other dependencies. We sometimes add the -static option here |
| 42 | 42 | # so that we can build a static executable that will run in a |
| 43 | 43 | # chroot jail. |
| 44 | 44 | # |
| 45 | 45 | LIB = -lz $(LDFLAGS) |
| 46 | -# If you're on OpenSolaris: | |
| 47 | -# LIB += lsocket | |
| 48 | -# Solaris 10 needs: | |
| 49 | -# LIB += -lsocket -lnsl | |
| 50 | -# My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. | |
| 51 | -# | |
| 46 | +HOST_OS!= uname -s | |
| 47 | +LIB.SunOS= -lsocket -lnsl | |
| 48 | +LIB += $(LIB.$(HOST_OS)) | |
| 49 | + | |
| 52 | 50 | # If using HTTPS: |
| 53 | 51 | LIB += -lcrypto -lssl |
| 54 | 52 | |
| 55 | 53 | #### Tcl shell for use in running the fossil testsuite. |
| 56 | 54 | # |
| 57 | 55 |
| --- Makefile | |
| +++ Makefile | |
| @@ -41,16 +41,14 @@ | |
| 41 | # other dependencies. We sometimes add the -static option here |
| 42 | # so that we can build a static executable that will run in a |
| 43 | # chroot jail. |
| 44 | # |
| 45 | LIB = -lz $(LDFLAGS) |
| 46 | # If you're on OpenSolaris: |
| 47 | # LIB += lsocket |
| 48 | # Solaris 10 needs: |
| 49 | # LIB += -lsocket -lnsl |
| 50 | # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. |
| 51 | # |
| 52 | # If using HTTPS: |
| 53 | LIB += -lcrypto -lssl |
| 54 | |
| 55 | #### Tcl shell for use in running the fossil testsuite. |
| 56 | # |
| 57 |
| --- Makefile | |
| +++ Makefile | |
| @@ -41,16 +41,14 @@ | |
| 41 | # other dependencies. We sometimes add the -static option here |
| 42 | # so that we can build a static executable that will run in a |
| 43 | # chroot jail. |
| 44 | # |
| 45 | LIB = -lz $(LDFLAGS) |
| 46 | HOST_OS!= uname -s |
| 47 | LIB.SunOS= -lsocket -lnsl |
| 48 | LIB += $(LIB.$(HOST_OS)) |
| 49 | |
| 50 | # If using HTTPS: |
| 51 | LIB += -lcrypto -lssl |
| 52 | |
| 53 | #### Tcl shell for use in running the fossil testsuite. |
| 54 | # |
| 55 |