From patchwork Thu Jun 14 13:43:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 164930 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 B14ABB7018 for ; Thu, 14 Jun 2012 23:43:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 60907319EE; Thu, 14 Jun 2012 13:43:49 +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 2BAHlTklz9DL; Thu, 14 Jun 2012 13:43:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2A067319F6; Thu, 14 Jun 2012 13:43:47 +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 45BF98F753 for ; Thu, 14 Jun 2012 13:43:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAE658D116 for ; Thu, 14 Jun 2012 13:43:44 +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 53uB9KWvjkX0 for ; Thu, 14 Jun 2012 13:43:35 +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 96A448D3CA for ; Thu, 14 Jun 2012 13:43:14 +0000 (UTC) Received: by eaaa12 with SMTP id a12so917417eaa.16 for ; Thu, 14 Jun 2012 06:43:12 -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; bh=4GIaPAIl+bRS5H0Ekld/cEXD53ImBX2dBhy65aYX/s4=; b=bGuo8CJEzJ3qSeZJ4N6u9FKmUTthuOwvNaH9E+FEMUruAHfUZYl7u//1vuO+v0wtWw iz6xu14cN7ZMGh/8iDoAcZTmtyLywEHSxrQjOhDj2yWKBgBZOpZqFcZmTUiBSZNdPP6g rXEYF23nSCusevOBF7MP82A9Z/u69kFRF3TjF9X+nJ/NUEk80qQdwVEn4+QOiyJ5uzW8 vP65uzKfD0dY6A6jYaFLAH8osNLY1euyn2qtAQ5MFatf2KmOJKgptczgk5rWhG/zbeW3 TDkn1PQAQPPDjVK0pd13BVd4nMJDauQPiNbnsGdyxQ410xLE6it3mJzwj+em1rc+fXkD mevQ== Received: by 10.14.101.138 with SMTP id b10mr577728eeg.56.1339681392500; Thu, 14 Jun 2012 06:43:12 -0700 (PDT) Received: from percy.train.local ([213.170.149.177]) by mx.google.com with ESMTPS id a16sm19551900eeg.0.2012.06.14.06.43.10 (version=SSLv3 cipher=OTHER); Thu, 14 Jun 2012 06:43:11 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 14 Jun 2012 14:43:08 +0100 Message-Id: <1339681388-13133-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] jquery: allow custom install location 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 Allow the JavaScript install path to be customised. By default, JavaScript files are installed to /var/www under the target root directory. Signed-off-by: Simon Dawson --- package/jquery/Config.in | 7 +++++++ package/jquery/jquery.mk | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/jquery/Config.in b/package/jquery/Config.in index 92f5604..e811d48 100644 --- a/package/jquery/Config.in +++ b/package/jquery/Config.in @@ -6,3 +6,10 @@ config BR2_PACKAGE_JQUERY animating, and Ajax interactions for rapid web development. http://jquery.com + +config BR2_PACKAGE_JQUERY_JAVASCRIPT_PATH + string "Target install path for JavaScript" + default "/var/www" + depends on BR2_PACKAGE_JQUERY + help + Specify a target install path for JavaScript files diff --git a/package/jquery/jquery.mk b/package/jquery/jquery.mk index 08dd4a3..a4c31a8 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_PACKAGE_JQUERY_JAVASCRIPT_PATH)/jquery.js endef define JQUERY_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/var/www/jquery.js + rm -f $(TARGET_DIR)/$(BR2_PACKAGE_JQUERY_JAVASCRIPT_PATH)/jquery.js endef $(eval $(call GENTARGETS))