Bug 527699 - [Webkit2] Update swt binary repo to include webextensions*
folder in swt.jar
Change linux makefile to not version webkitextensions dir.
Change-Id: I88c1f73c14f07366de7861547d9fe75f18de9d53
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 3c83804..14638ec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -52,7 +52,7 @@
# Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries.
WEBKIT_EXTENSION_LIB = lib$(WEBKIT_EXTENSION_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-WEBEXTENSION_DIR = webkitextensions$(maj_ver)$(min_ver)
+WEBEXTENSION_DIR = webkitextensions
CAIROCFLAGS = `pkg-config --cflags cairo`
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
@@ -246,7 +246,6 @@
install: all
cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
ifeq ($(GTK_VERSION), 3.0) # Copy webextension into it's own folder, but create folder first.
- [ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) # If folder not exist, make it.
cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/
endif
#