From patchwork Tue Jun 19 06:56:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 165675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 4F0D3B700A for ; Tue, 19 Jun 2012 16:57:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2719E31CB0; Tue, 19 Jun 2012 06:57:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NajuxisAAQeN; Tue, 19 Jun 2012 06:57:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4547031CC0; Tue, 19 Jun 2012 06:57:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E2D6D8F753 for ; Tue, 19 Jun 2012 06:57:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DF7DF8CD62 for ; Tue, 19 Jun 2012 06:57:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p2EbN9mZpdhN for ; Tue, 19 Jun 2012 06:57:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ey0-f171.google.com (mail-ey0-f171.google.com [209.85.215.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 42AD88CD35 for ; Tue, 19 Jun 2012 06:57:17 +0000 (UTC) Received: by eaaa12 with SMTP id a12so3089506eaa.16 for ; Mon, 18 Jun 2012 23:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=5wITnEASHggnhTovLBW3bfcndtkPK6vWspg53pPBRnY=; b=GW3/rKQsLf+K0wxELfivuisgnHlhfy/ptGMhRGI1KgcB4+Yw/7eyOi3j1ZoyKhZNO5 4kqxJL16fjd8prvJ2sKhDR29ymFJWwWPWDhkRqq4wglrj8mLkxsQpF3Q0ltcJ5kJ3oEd UfZdIwtU91BslpZkvtnzu8/a13xI+Zt6oQBJfpaaY2Qa8weQkfIbiZsgwcSdwQECb50z v84rA0l84altSA/z6RYSuJ7EjnUGhqGm6I9PpABVVPhIiRlUx8l+mFXe5FWGdWuOYHqp 62d3JgYHE2lD+0cVnskDVKj9wIq6GP4U56mJtDNP1YPqD4/ryka4x63rXDdO78zBERLD Vw7g== Received: by 10.14.29.78 with SMTP id h54mr4015863eea.132.1340089034925; Mon, 18 Jun 2012 23:57:14 -0700 (PDT) Received: from localhost.localdomain (host-2-100-182-54.as13285.net. [2.100.182.54]) by mx.google.com with ESMTPS id t3sm71517809eeb.15.2012.06.18.23.57.13 (version=SSLv3 cipher=OTHER); Mon, 18 Jun 2012 23:57:14 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 19 Jun 2012 07:56:04 +0100 Message-Id: <1340088964-10630-3-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340088964-10630-1-git-send-email-spdawson@gmail.com> References: <1340088964-10630-1-git-send-email-spdawson@gmail.com> Subject: [Buildroot] [PATCH RFC 2/2] Use JavaScript install path from configuration during package installation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Signed-off-by: Simon Dawson --- package/explorercanvas/explorercanvas.mk | 4 ++-- package/flot/flot.mk | 4 ++-- package/jquery-sparkline/jquery-sparkline.mk | 4 ++-- package/jquery-validation/jquery-validation.mk | 4 ++-- package/jquery/jquery.mk | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/explorercanvas/explorercanvas.mk b/package/explorercanvas/explorercanvas.mk index 93dcb1f..e099faa 100644 --- a/package/explorercanvas/explorercanvas.mk +++ b/package/explorercanvas/explorercanvas.mk @@ -8,11 +8,11 @@ endef define EXPLORERCANVAS_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/excanvas.compiled.js \ - $(TARGET_DIR)/var/www/excanvas.js + $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/excanvas.js endef define EXPLORERCANVAS_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/excanvas.js + rm -f $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/excanvas.js endef $(eval $(call GENTARGETS)) diff --git a/package/flot/flot.mk b/package/flot/flot.mk index 8b51b55..3d6987e 100644 --- a/package/flot/flot.mk +++ b/package/flot/flot.mk @@ -12,12 +12,12 @@ FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\ define FLOT_INSTALL_TARGET_CMDS for i in $(FLOT_FILES); do \ - $(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js; \ + $(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/$$i.js; \ done endef define FLOT_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/jquery.flot* + rm -f $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.flot* endef $(eval $(call GENTARGETS)) diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk index d0b478a..3ef1dc7 100644 --- a/package/jquery-sparkline/jquery-sparkline.mk +++ b/package/jquery-sparkline/jquery-sparkline.mk @@ -8,11 +8,11 @@ endef define JQUERY_SPARKLINE_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SPARKLINE_SOURCE) \ - $(TARGET_DIR)/var/www/jquery.sparkline.js + $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.sparkline.js endef define JQUERY_SPARKLINE_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/jquery.sparkline.js + rm -f $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.sparkline.js endef $(eval $(call GENTARGETS)) diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk index 5fee4c1..ccf1155 100644 --- a/package/jquery-validation/jquery-validation.mk +++ b/package/jquery-validation/jquery-validation.mk @@ -8,11 +8,11 @@ endef define JQUERY_VALIDATION_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/jquery.validate.min.js \ - $(TARGET_DIR)/var/www/jquery.validate.js + $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.validate.js endef define JQUERY_VALIDATION_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/jquery.validate.js + rm -f $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.validate.js endef $(eval $(call GENTARGETS)) diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk index 08dd4a3..93d8eab 100644 --- a/package/jquery/jquery.mk +++ b/package/jquery/jquery.mk @@ -8,11 +8,11 @@ endef define JQUERY_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SOURCE) \ - $(TARGET_DIR)/var/www/jquery.js + $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.js endef define JQUERY_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/jquery.js + rm -f $(TARGET_DIR)/$(BR2_JAVASCRIPT_INSTALL_PATH)/jquery.js endef $(eval $(call GENTARGETS))