Skip to content

Commit e19e0d4

Browse files
committed
Merge branch 'Mine02C4-exclude_dotfiles'
2 parents 22faadf + 3523c8d commit e19e0d4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

common/Makefile

Lines changed: 4 additions & 4 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,10 +103,10 @@ xpi:
103103
echo "locale liberator $(LOCALE) common/locale/$(LOCALE)/" >> $(XPI_PATH)/chrome.manifest; \
104104
fi
105105
# Copy components and modules directories
106-
$(CP) -Lr $(XPI_DIRS) -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
108-
cd $(COMMON_DIR) && $(CP) -Lr --parents $(COMMON_CHROME_DIRS) -t $(XPI_PATH)/common || true
109-
$(CP) -Lr --parents $(CHROME_DIRS) -t $(XPI_PATH) || true
108+
cd $(COMMON_DIR) && find $(COMMON_CHROME_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) --parents {} -t $(XPI_PATH)/common || true
109+
find $(CHROME_DIRS) -follow -type f ! -name ".*" -print0 | xargs -0i $(CP) --parents {} -t $(XPI_PATH) || true
110110
# TODO: Replace ###VERSION### tags
111111
@echo "Replacing ###VERSION### and ###DATE### tags"
112112
find $(XPI_PATH) -type f ! -name "*.png" -exec $(SED) -i -e "s,###VERSION###,$(VERSION),g" -e "s,###DATE###,$(BUILD_DATE),g" {} \;

0 commit comments

Comments
 (0)