Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/2cebe260582e646252052209d61fb78513566046
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/2cebe260582e646252052209d61fb78513566046
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/2cebe260582e646252052209d61fb78513566046

The branch, master has been updated
       via  2cebe260582e646252052209d61fb78513566046 (commit)
      from  3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=2cebe260582e646252052209d61fb78513566046
commit 2cebe260582e646252052209d61fb78513566046
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    enforce setting subtarget so gtk2 gets named the correct thing in installs

diff --git a/Makefile b/Makefile
index 166bf81..f8b5e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -303,13 +303,8 @@ else
                 else
                  ifeq ($(TARGET),gtk2)
                     override TARGET := gtk
-                    ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
-                      override NETSURF_GTK_MAJOR := 2
-                    else
-                      ifneq ($(NETSURF_GTK_MAJOR),2)
-                        SUBTARGET = $(NETSURF_GTK_MAJOR)
-                      endif
-                    endif
+                    override NETSURF_GTK_MAJOR := 2
+                    SUBTARGET = $(NETSURF_GTK_MAJOR)
                   endif
                 endif
               endif


-----------------------------------------------------------------------

Summary of changes:
 Makefile |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 166bf81..f8b5e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -303,13 +303,8 @@ else
                 else
                  ifeq ($(TARGET),gtk2)
                     override TARGET := gtk
-                    ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
-                      override NETSURF_GTK_MAJOR := 2
-                    else
-                      ifneq ($(NETSURF_GTK_MAJOR),2)
-                        SUBTARGET = $(NETSURF_GTK_MAJOR)
-                      endif
-                    endif
+                    override NETSURF_GTK_MAJOR := 2
+                    SUBTARGET = $(NETSURF_GTK_MAJOR)
                   endif
                 endif
               endif


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to