diff -ru msp430-libc.orig/include/msp430/tlv.h msp430-libc/include/msp430/tlv.h
--- msp430-libc.orig/include/msp430/tlv.h	2008-11-07 01:27:23.000000000 -0800
+++ msp430-libc/include/msp430/tlv.h	2008-11-07 01:28:43.000000000 -0800
@@ -15,10 +15,6 @@
 
 
 /* TLV Calibration Data Structure */
-#define TAG_DCO_30             0x01      /* Tag for DCO30  Calibration Data */
-#define TAG_ADC12_1            0x10      /* Tag for ADC12_1 Calibration Data */
-#define TAG_EMPTY              0xFE      /* Tag for Empty Data Field in Calibration Data */
-
 #define TLV_CHECKSUM_          0x10C0    /* TLV CHECK SUM */
 sfrw(TLV_CHECKSUM, TLV_CHECKSUM_);
 #define TLV_DCO_30_TAG_        0x10F6    /* TLV TAG_DCO30 TAG */
@@ -30,14 +26,6 @@
 #define TLV_ADC12_1_LEN_       0x10DB    /* TLV ADC12_1 LEN */
 sfrb(TLV_ADC12_1_LEN, TLV_ADC12_1_LEN_);
 
-#define CAL_ADC_25T85          0x0007    /* Index for 2.5V/85Deg Cal. Value */
-#define CAL_ADC_25T30          0x0006    /* Index for 2.5V/30Deg Cal. Value */
-#define CAL_ADC_25VREF_FACTOR  0x0005    /* Index for 2.5V Ref. Factor */
-#define CAL_ADC_15T85          0x0004    /* Index for 1.5V/85Deg Cal. Value */
-#define CAL_ADC_15T30          0x0003    /* Index for 1.5V/30Deg Cal. Value */
-#define CAL_ADC_15VREF_FACTOR  0x0002    /* Index for ADC 1.5V Ref. Factor */
-#define CAL_ADC_OFFSET         0x0001    /* Index for ADC Offset */
-#define CAL_ADC_GAIN_FACTOR    0x0000    /* Index for ADC Gain Factor */
 
 #define CALDCO_16MHZ_         0x10F8    /* DCOCTL  Calibration Data for 16MHz */
 sfrb(CALDCO_16MHZ, CALDCO_16MHZ_);
@@ -56,6 +44,22 @@
 #define CALBC1_1MHZ_          0x10FF    /* BCSCTL1 Calibration Data for 1MHz */
 sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
+
+#ifdef __ASSEMBLER__
+
+#define TAG_DCO_30             0x01      /* Tag for DCO30  Calibration Data */
+#define TAG_ADC12_1            0x10      /* Tag for ADC12_1 Calibration Data */
+#define TAG_EMPTY              0xFE      /* Tag for Empty Data Field in Calibration Data */
+
+#define CAL_ADC_25T85          0x0007    /* Index for 2.5V/85Deg Cal. Value */
+#define CAL_ADC_25T30          0x0006    /* Index for 2.5V/30Deg Cal. Value */
+#define CAL_ADC_25VREF_FACTOR  0x0005    /* Index for 2.5V Ref. Factor */
+#define CAL_ADC_15T85          0x0004    /* Index for 1.5V/85Deg Cal. Value */
+#define CAL_ADC_15T30          0x0003    /* Index for 1.5V/30Deg Cal. Value */
+#define CAL_ADC_15VREF_FACTOR  0x0002    /* Index for ADC 1.5V Ref. Factor */
+#define CAL_ADC_OFFSET         0x0001    /* Index for ADC Offset */
+#define CAL_ADC_GAIN_FACTOR    0x0000    /* Index for ADC Gain Factor */
+
 #define CAL_DCO_16MHZ          0x0000    /* Index for DCOCTL  Calibration Data for 16MHz */
 #define CAL_BC1_16MHZ          0x0001    /* Index for BCSCTL1 Calibration Data for 16MHz */
 #define CAL_DCO_12MHZ          0x0002    /* Index for DCOCTL  Calibration Data for 12MHz */
@@ -65,7 +69,8 @@
 #define CAL_DCO_1MHZ           0x0006    /* Index for DCOCTL  Calibration Data for 1MHz */
 #define CAL_BC1_1MHZ           0x0007    /* Index for BCSCTL1 Calibration Data for 1MHz */
 
-#ifndef __ASSEMBLER__
+#else
+
 /* Structured declaration */
 typedef enum
 {
diff -ru msp430-libc.orig/src/Makefile msp430-libc/src/Makefile
--- msp430-libc.orig/src/Makefile	2008-11-07 01:27:24.000000000 -0800
+++ msp430-libc/src/Makefile	2008-11-07 01:24:31.000000000 -0800
@@ -8,7 +8,7 @@
 # installation prefix (set this if you don't install by hand)
 
 #prefix = /usr
-prefix = /usr/local/msp430
+prefix = $(PREFIX)
 
 # name of target architecture (used for conform naming)