Fix make distcheck allowing custom build directories.

This commit is contained in:
Peter Hutterer
2008-12-22 14:53:27 +10:00
parent 7cb41b467a
commit 6f855ac348
2 changed files with 5 additions and 8 deletions

View File

@@ -18,14 +18,12 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SHARED_DIR = $(top_srcdir)/shared
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_la_LIBADD = $(SHARED_DIR)/lib@DRIVER_NAME@.la
@DRIVER_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
@DRIVER_NAME@_drv_ladir = @inputdir@
INCLUDES = -I$(SHARED_DIR)
INCLUDES = -I$(top_srcdir)/shared
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c xf86OSmouse.h

View File

@@ -20,11 +20,10 @@
bin_PROGRAMS = @DRIVER_NAME@_detect
SHARED_PATH = $(top_srcdir)/shared
INCLUDES = -I$(SHARED_PATH)
INCLUDES = -I$(top_srcdir)/shared
@DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c
@DRIVER_NAME@_detect_LDADD = $(SHARED_PATH)/lib@DRIVER_NAME@.la
@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
calloutsdir=$(HAL_CALLOUTS_DIR)
callouts_SCRIPTS = hal-probe-vmmouse
@@ -32,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse
hal-probe-vmmouse:
sed -e 's|__BIN_PREFIX__|$(bindir)|g' \
-e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \
< $@.in > $@
< $(srcdir)/$@.in > $@
EXTRA_DIST = hal-probe-vmmouse.in