docker: s/PKGCONFIG/PKG_CONFIG/ to be consistent
Patch by Markus Heidelberg.
This commit is contained in:
parent
7543f7dff4
commit
ac71691272
@ -13,11 +13,11 @@
|
||||
$(target): $(sources:.c=.o)
|
||||
$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
|
||||
- `pkg-config --libs glib-2.0` $^ -o $@
|
||||
+ `$(PKGCONFIG) --libs glib-2.0` $^ -o $@
|
||||
+ `$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
|
||||
|
||||
%.o: %.c
|
||||
- $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
|
||||
+ $(CC) -c $(CFLAGS) `$(PKGCONFIG) --cflags glib-2.0` $<
|
||||
+ $(CC) -c $(CFLAGS) `$(PKG_CONFIG) --cflags glib-2.0` $<
|
||||
|
||||
version.h: version.h.in Makefile
|
||||
sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
|
||||
|
@ -14,6 +14,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
|
||||
CFLAGS="-I$(STAGING_DIR)/usr/include \
|
||||
-I$(STAGING_DIR)/usr/include/glib-2.0 \
|
||||
-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
|
||||
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
|
||||
|
||||
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
|
||||
|
Loading…
Reference in New Issue
Block a user