Skip to content

Commit 3f08431

Browse files
committed
Makefile fixes
1 parent c646d6e commit 3f08431

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Makefile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif
1212

1313
# Check LIBOGC_VER
1414
ifeq ($(strip $(LIBOGC_VER)),)
15-
export LIBOGC_VER := libogc-mod
15+
LIBOGC_VER := libogc-mod
1616
else ifneq ($(LIBOGC_VER),libogc)
1717
ifneq ($(LIBOGC_VER),libogc2)
1818
ifneq ($(LIBOGC_VER),libogc-mod)
@@ -135,31 +135,30 @@ export LIBPATHS := -L$(LIBOGC_LIB) $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
135135
#---------------------------------------------------------------------------------
136136
# set up portlibs directory
137137
#---------------------------------------------------------------------------------
138-
export PORTLIBS_DIR := $(DESTDIR)
139138
ifeq ($(PLATFORM),gamecube)
140139
ifeq ($(LIBOGC_VER),libogc)
141-
PORTLIBS_DIR += $(PORTLIBS_PATH)/gamecube
140+
PORTLIBS_DIR = $(DESTDIR)$(PORTLIBS_PATH)/gamecube
142141
else
143-
PORTLIBS_DIR += $(DEVKITPRO)/$(LIBOGC_VER)/portlibs/gamecube
142+
PORTLIBS_DIR = $(DESTDIR)$(DEVKITPRO)/$(LIBOGC_VER)/portlibs/gamecube
144143
endif
145144
else
146145
ifeq ($(LIBOGC_VER),libogc)
147-
PORTLIBS_DIR += $(PORTLIBS_PATH)/wii
146+
PORTLIBS_DIR = $(DESTDIR)$(PORTLIBS_PATH)/wii
148147
else
149-
PORTLIBS_DIR += $(DEVKITPRO)/$(LIBOGC_VER)/portlibs/wii
148+
PORTLIBS_DIR = $(DESTDIR)$(DEVKITPRO)/$(LIBOGC_VER)/portlibs/wii
150149
endif
151150
endif
152151

153152
#---------------------------------------------------------------------------------
154153
$(BUILD):
155-
@[ -d $@ ] || mkdir -p $@
156-
@[ -d $(CURDIR)/bin ] || mkdir -p $(CURDIR)/bin
154+
@[[ -d $@ ]] || mkdir -p $@
155+
@[[ -d $(CURDIR)/bin ]] || mkdir -p $(CURDIR)/bin
157156
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
158157

159158
#---------------------------------------------------------------------------------
160159
install: $(BUILD)
161-
@[ -d $(PORTLIBS_DIR)/include ] || mkdir -p $(PORTLIBS_DIR)/include
162-
@[ -d $(PORTLIBS_DIR)/lib ] || mkdir -p $(PORTLIBS_DIR)/lib
160+
@[[ -d $(PORTLIBS_DIR)/include ]] || mkdir -p $(PORTLIBS_DIR)/include
161+
@[[ -d $(PORTLIBS_DIR)/lib ]] || mkdir -p $(PORTLIBS_DIR)/lib
163162

164163
cp -f $(CURDIR)/include/audiogc.hpp $(PORTLIBS_DIR)/include/audiogc.hpp
165164

0 commit comments

Comments
 (0)