X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fvcd.c;h=ba06c5ae69d885bdc43effe63f9708dd147da33f;hb=471ac344a5885c73f58cbcd0d0c87f416926afc2;hp=8dd503a273ea42649458284a0c22a8c3d177e221;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/output/vcd.c b/src/output/vcd.c
index 8dd503a2..ba06c5ae 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -15,14 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE and others. */
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -104,7 +103,7 @@ static GString *gen_header(const struct sr_output *o)
 
 	/* generator */
 	g_string_append_printf(header, "$version %s %s $end\n",
-			PACKAGE, PACKAGE_VERSION);
+			PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
 	g_string_append_printf(header, "$comment\n  Acquisition with "
 			"%d/%d channels", ctx->num_enabled_channels, num_channels);
 
@@ -135,7 +134,7 @@ static GString *gen_header(const struct sr_output *o)
 	g_free(frequency_s);
 
 	/* scope */
-	g_string_append_printf(header, "$scope module %s $end\n", PACKAGE);
+	g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
 
 	/* Wires / channels */
 	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {