[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33066 - gnunet/src/sensor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33066 - gnunet/src/sensor |
Date: |
Mon, 14 Apr 2014 15:54:29 +0200 |
Author: otarabai
Date: 2014-04-14 15:54:29 +0200 (Mon, 14 Apr 2014)
New Revision: 33066
Modified:
gnunet/src/sensor/Makefile.am
gnunet/src/sensor/gnunet-service-sensor.c
Log:
fixed loading sensor definitions
Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am 2014-04-14 13:21:12 UTC (rev 33065)
+++ gnunet/src/sensor/Makefile.am 2014-04-14 13:54:29 UTC (rev 33066)
@@ -57,3 +57,13 @@
test_sensor_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+pkgsensordir = sensors
+
+install-data-local:
+ $(mkinstalldirs) $(datadir)/$(PACKAGE)/$(pkgsensordir)
+ @$(NORMAL_INSTALL)
+ for sensor in $(pkgsensordir)/*; do \
+ if test -f $$sensor; then \
+ $(INSTALL_DATA) $$sensor $(datadir)/$(PACKAGE)/$(pkgsensordir)/ ; \
+ fi \
+ done
Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c 2014-04-14 13:21:12 UTC (rev
33065)
+++ gnunet/src/sensor/gnunet-service-sensor.c 2014-04-14 13:54:29 UTC (rev
33066)
@@ -383,11 +383,9 @@
char* datadir;
char* sensordir;
- datadir = GNUNET_OS_installation_get_path(GNUNET_OS_IPK_SELF_PREFIX);
- //should eval to '$prefix/share/gnunet-mi/sensors/'
- //TODO: is there a better way?
- GNUNET_asprintf(&sensordir, "%sshare%sgnunet-mi%ssensors%s",
- datadir, DIR_SEPARATOR_STR, DIR_SEPARATOR_STR, DIR_SEPARATOR_STR);
+ datadir = GNUNET_OS_installation_get_path(GNUNET_OS_IPK_DATADIR);
+ GNUNET_asprintf(&sensordir, "%ssensors%s",
+ datadir, DIR_SEPARATOR_STR);
return sensordir;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33066 - gnunet/src/sensor,
gnunet <=