Skip to content

Commit ecf3c8f

Browse files
committed
kinda revert pushd/popd - they were specific to bash.
1 parent 67c13f8 commit ecf3c8f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile.cmake-common

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ $(JUCE_DIR)/.stamp-juce:
6262
for patch in $(JUCE_PATCHES) ; do \
6363
echo "JUCE patch: $${patch}" ; \
6464
if [ '$${patch}' != '' ] ; then \
65-
pushd $(JUCE_DIR) && git apply $${patch} --ignore-space-change && popd ; \
65+
PREV_DIR=$(PWD) && cd $(JUCE_DIR) && git apply $${patch} --ignore-space-change && cd $(PREV_DIR) ; \
6666
fi ; \
6767
done
6868
echo "For CMake build we need another standard patch..."
6969
if [ "$(AAP_JUCE_CMAKE_SKIP_DEFAULT_PATCHES)" == "" ] ; then \
7070
if [ "$(AAP_JUCE_CMAKE_PATCH_HOSTING)" != "" ] ; then \
71-
pushd $(JUCE_DIR) && git apply $(AAP_JUCE_DIR)/JUCE-support-Android-CMake-hosting.patch --ignore-space-change && popd ; \
71+
PREV_DIR=$(PWD) && cd $(JUCE_DIR) && git apply $(AAP_JUCE_DIR)/JUCE-support-Android-CMake-hosting.patch --ignore-space-change && cd $(PREV_DIR) ; \
7272
else \
73-
pushd $(JUCE_DIR) && git apply $(AAP_JUCE_DIR)/JUCE-support-Android-CMake.patch --ignore-space-change && popd ; \
73+
PREV_DIR=$(PWD) && cd $(JUCE_DIR) && git apply $(AAP_JUCE_DIR)/JUCE-support-Android-CMake.patch --ignore-space-change && cd $(PREV_DIR) ; \
7474
fi ; \
7575
fi
7676
touch $(JUCE_DIR)/.stamp-juce
@@ -79,7 +79,7 @@ patch-app-cmake: $(APP_SRC_DIR)/.stamp-app
7979

8080
$(APP_SRC_DIR)/.stamp-app:
8181
if [ $(PATCH_FILE) ] ; then \
82-
pushd $(APP_SRC_DIR) && git apply $(PATCH_FILE) --ignore-space-change && popd; \
82+
PREV_DIR=$(PWD) && cd $(APP_SRC_DIR) && git apply $(PATCH_FILE) --ignore-space-change && cd $(PREV_DIR); \
8383
touch $(APP_SRC_DIR)/.stamp-app ; \
8484
fi
8585

0 commit comments

Comments
 (0)