Ticket #22401: patch-config.mak.diff

File patch-config.mak.diff, 972 bytes (added by m.thon@…, 14 years ago)

  • config.mak

    old new  
    1717FREETYPE_LIBS ?= $(shell pkg-config --libs freetype2)
    1818CAIRO_CFLAGS  ?= $(shell pkg-config --cflags cairo)
    1919CAIRO_LIBS    ?= $(shell pkg-config --libs cairo)
    20 LUA_CFLAGS    ?= $(shell pkg-config --cflags lua5.1)
    21 LUA_LIBS      ?= $(shell pkg-config --libs lua5.1)
     20LUA_CFLAGS    ?= $(shell pkg-config --cflags lua)
     21LUA_LIBS      ?= $(shell pkg-config --libs lua)
    2222QT_CFLAGS     ?= $(shell pkg-config --cflags QtGui QtCore)
    2323QT_LIBS       ?= $(shell pkg-config --libs QtGui QtCore)
    24 MOC           ?= moc
     24ifeq "$(MOC)" ""
     25MOC     ?= moc
     26endif
    2527#
    2628# --------------------------------------------------------------------
    2729#
    … …  
    3941# Installing Ipe:
    4042#
    4143IPEVERS = 7.0.8
     44INSTALL_DIR = $(DESTDIR)
    4245#
    4346# IPEPREFIX is the global prefix for the Ipe directory structure, which
    4447# you can override individually for any of the specific directories.