diff options
author | pixdamix <pixdamix@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-28 04:05:33 (EST) |
---|---|---|
committer | pixdamix <pixdamix@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-12-28 04:05:33 (EST) |
commit | b10ba43e784742fe194351270c813a4a6d722e4e (patch) | |
tree | f04201999716d3eedc047460e6b07a481127b581 /libopkg | |
parent | cef79820ba49861601f4b1f90ff21056d0afd3ba (diff) |
Add a configure flag to specify the lockfile path
git-svn-id: http://opkg.googlecode.com/svn/trunk@511 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg')
-rw-r--r-- | libopkg/Makefile.am | 2 | ||||
-rw-r--r-- | libopkg/opkg_conf.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am index 524df5c..6be44ad 100644 --- a/libopkg/Makefile.am +++ b/libopkg/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) +AM_CFLAGS=-Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DOPKGETCDIR=\"@opkgetcdir@\" -DOPKGLOCKFILE=\"@opkglockfile@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS) $(PATHFINDER_CFLAGS) libopkg_includedir=$(includedir)/libopkg libopkg_include_HEADERS= *.h diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index 49944aa..9c02cbd 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -473,9 +473,9 @@ opkg_conf_init(void) globfree(&globbuf); if (conf->offline_root) - sprintf_alloc (&lock_file, "%s/%s/lock", conf->offline_root, OPKG_STATE_DIR_PREFIX); + sprintf_alloc (&lock_file, "%s/%s", conf->offline_root, OPKGLOCKFILE); else - sprintf_alloc (&lock_file, "%s/lock", OPKG_STATE_DIR_PREFIX); + sprintf_alloc (&lock_file, "%s", OPKGLOCKFILE); lock_fd = creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP); if (lock_fd == -1) { |