Skip to content

Commit 3523c8d

Browse files
committed
Set COMMON_DIR by the relative path and use "--parents" option of cp.
1 parent a555114 commit 3523c8d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

common/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
TOP = $(shell pwd)
44
OS = $(shell uname -s)
55
BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S")
6-
COMMON_DIR = $(TOP)/../common
6+
COMMON_DIR = ../common
77
GOOGLE_PROJ = vimperator-labs
88
GOOGLE = https://$(GOOGLE_PROJ).googlecode.com/files
99

@@ -103,7 +103,7 @@ xpi:
103103
echo "locale liberator $(LOCALE) common/locale/$(LOCALE)/" >> $(XPI_PATH)/chrome.manifest; \
104104
fi
105105
# Copy components and modules directories
106-
find $(XPI_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) {} -t $(XPI_PATH) || true
106+
find $(XPI_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) --parents {} -t $(XPI_PATH) || true
107107
# Copy all chrome files, from both commmon/ and vimperator/ folders
108108
cd $(COMMON_DIR) && find $(COMMON_CHROME_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) --parents {} -t $(XPI_PATH)/common || true
109109
find $(CHROME_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) --parents {} -t $(XPI_PATH) || true

0 commit comments

Comments
 (0)